PlotSquared source diff between v6 and v7

Files changed (232) hide show
  1. .github/ISSUE_TEMPLATE/bug_report.yml +3 -1
  2. .github/workflows/announce-release-on-discord.yml +2 -2
  3. .github/workflows/build-pr.yml +3 -3
  4. .github/workflows/build.yml +10 -10
  5. .github/workflows/codeql.yml +13 -5
  6. .github/workflows/release-drafter.yml +3 -3
  7. .gitignore +4 -0
  8. .idea/icon.svg +125 -29
  9. Bukkit/build.gradle.kts +5 -5
  10. Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java +19 -3
  11. Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java +86 -187
  12. Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java +2 -14
  13. Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java +203 -21
  14. Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java +8 -2
  15. Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java +2 -2
  16. Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java +92 -25
  17. Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java +5 -1
  18. Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java +2 -1
  19. Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java +11 -28
  20. Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java +31 -36
  21. Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener113.java +0 -91
  22. Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java +155 -88
  23. Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java +14 -4
  24. Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java +0 -63
  25. Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java +1 -1
  26. Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java +1 -1
  27. Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java +8 -24
  28. Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java +1 -3
  29. Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java +1 -1
  30. Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java +8 -6
  31. Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java +69 -37
  32. Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java +35 -9
  33. Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java +1 -1
  34. Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java +4 -4
  35. Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java +1 -1
  36. Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +5 -4
  37. Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java +0 -8
  38. Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java +64 -0
  39. Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java +2 -1
  40. Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweRegionManager.java +0 -5
  41. Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java +2 -2
  42. Bukkit/src/main/resources/plugin.yml +5 -5
  43. CODE_OF_CONDUCT.md +3 -3
  44. Core/build.gradle.kts +2 -1
  45. Core/src/main/java/com/plotsquared/core/PlotAPI.java +3 -3
  46. Core/src/main/java/com/plotsquared/core/PlotSquared.java +9 -3
  47. Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java +1 -1
  48. Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java +8 -11
  49. Core/src/main/java/com/plotsquared/core/command/Add.java +16 -8
  50. Core/src/main/java/com/plotsquared/core/command/Alias.java +19 -8
  51. Core/src/main/java/com/plotsquared/core/command/Area.java +141 -100
  52. Core/src/main/java/com/plotsquared/core/command/Auto.java +34 -20
  53. Core/src/main/java/com/plotsquared/core/command/Backup.java +74 -30
  54. Core/src/main/java/com/plotsquared/core/command/Biome.java +10 -10
  55. Core/src/main/java/com/plotsquared/core/command/Buy.java +15 -9
  56. Core/src/main/java/com/plotsquared/core/command/Caps.java +14 -9
  57. Core/src/main/java/com/plotsquared/core/command/Chat.java +0 -54
  58. Core/src/main/java/com/plotsquared/core/command/Claim.java +32 -14
  59. Core/src/main/java/com/plotsquared/core/command/Clear.java +31 -29
  60. Core/src/main/java/com/plotsquared/core/command/Cluster.java +164 -116
  61. Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java +8 -4
  62. Core/src/main/java/com/plotsquared/core/command/Command.java +42 -22
  63. Core/src/main/java/com/plotsquared/core/command/CommandCaller.java +2 -2
  64. Core/src/main/java/com/plotsquared/core/command/CommandCategory.java +7 -0
  65. Core/src/main/java/com/plotsquared/core/command/Comment.java +19 -9
  66. Core/src/main/java/com/plotsquared/core/command/Condense.java +28 -13
  67. Core/src/main/java/com/plotsquared/core/command/Continue.java +8 -4
  68. Core/src/main/java/com/plotsquared/core/command/Copy.java +10 -4
  69. Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java +4 -2
  70. Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java +17 -7
  71. Core/src/main/java/com/plotsquared/core/command/Debug.java +47 -17
  72. Core/src/main/java/com/plotsquared/core/command/DebugExec.java +17 -9
  73. Core/src/main/java/com/plotsquared/core/command/DebugPaste.java +16 -12
  74. Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java +18 -13
  75. Core/src/main/java/com/plotsquared/core/command/Delete.java +10 -5
  76. Core/src/main/java/com/plotsquared/core/command/Deny.java +10 -5
  77. Core/src/main/java/com/plotsquared/core/command/Desc.java +5 -3
  78. Core/src/main/java/com/plotsquared/core/command/Done.java +6 -4
  79. Core/src/main/java/com/plotsquared/core/command/Download.java +39 -21
  80. Core/src/main/java/com/plotsquared/core/command/FlagCommand.java +106 -59
  81. Core/src/main/java/com/plotsquared/core/command/Grant.java +9 -7
  82. Core/src/main/java/com/plotsquared/core/command/Help.java +28 -16
  83. Core/src/main/java/com/plotsquared/core/command/HomeCommand.java +10 -6
  84. Core/src/main/java/com/plotsquared/core/command/Inbox.java +53 -36
  85. Core/src/main/java/com/plotsquared/core/command/Info.java +14 -5
  86. Core/src/main/java/com/plotsquared/core/command/Kick.java +7 -5
  87. Core/src/main/java/com/plotsquared/core/command/Leave.java +4 -2
  88. Core/src/main/java/com/plotsquared/core/command/Like.java +6 -4
  89. Core/src/main/java/com/plotsquared/core/command/ListCmd.java +75 -63
  90. Core/src/main/java/com/plotsquared/core/command/Load.java +11 -43
  91. Core/src/main/java/com/plotsquared/core/command/MainCommand.java +4 -3
  92. Core/src/main/java/com/plotsquared/core/command/Merge.java +34 -19
  93. Core/src/main/java/com/plotsquared/core/command/Move.java +7 -3
  94. Core/src/main/java/com/plotsquared/core/command/Music.java +20 -9
  95. Core/src/main/java/com/plotsquared/core/command/Near.java +4 -2
  96. Core/src/main/java/com/plotsquared/core/command/Owner.java +19 -8
  97. Core/src/main/java/com/plotsquared/core/command/PluginCmd.java +5 -3
  98. Core/src/main/java/com/plotsquared/core/command/Purge.java +29 -40
  99. Core/src/main/java/com/plotsquared/core/command/Rate.java +7 -5
  100. Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java +8 -6
  101. Core/src/main/java/com/plotsquared/core/command/Remove.java +7 -5
  102. Core/src/main/java/com/plotsquared/core/command/Save.java +0 -130
  103. Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java +37 -14
  104. Core/src/main/java/com/plotsquared/core/command/Set.java +9 -4
  105. Core/src/main/java/com/plotsquared/core/command/SetCommand.java +11 -3
  106. Core/src/main/java/com/plotsquared/core/command/SetHome.java +4 -2
  107. Core/src/main/java/com/plotsquared/core/command/Setup.java +7 -2
  108. Core/src/main/java/com/plotsquared/core/command/Swap.java +7 -3
  109. Core/src/main/java/com/plotsquared/core/command/Target.java +5 -3
  110. Core/src/main/java/com/plotsquared/core/command/Template.java +19 -10
  111. Core/src/main/java/com/plotsquared/core/command/Toggle.java +17 -15
  112. Core/src/main/java/com/plotsquared/core/command/Trust.java +19 -9
  113. Core/src/main/java/com/plotsquared/core/command/Unlink.java +4 -2
  114. Core/src/main/java/com/plotsquared/core/command/Visit.java +23 -17
  115. Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java +11 -51
  116. Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java +30 -21
  117. Core/src/main/java/com/plotsquared/core/configuration/Config.java +0 -37
  118. Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java +11 -0
  119. Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java +32 -6
  120. Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java +13 -2
  121. Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java +7 -0
  122. Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java +0 -103
  123. Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java +15 -0
  124. Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java +1 -1
  125. Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java +2 -1
  126. Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java +2 -0
  127. Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java +2 -0
  128. Core/src/main/java/com/plotsquared/core/database/SQLManager.java +14 -19
  129. Core/src/main/java/com/plotsquared/core/events/EntityEvent.java +2 -1
  130. Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java +0 -32
  131. Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java +0 -9
  132. Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java +4 -19
  133. Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java +5 -4
  134. Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java +16 -15
  135. Core/src/main/java/com/plotsquared/core/generator/HybridGen.java +76 -45
  136. Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java +31 -3
  137. Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java +4 -38
  138. Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java +1 -36
  139. Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java +23 -13
  140. Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java +19 -7
  141. Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java +16 -8
  142. Core/src/main/java/com/plotsquared/core/listener/PlotListener.java +49 -55
  143. Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java +4 -2
  144. Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java +5 -11
  145. Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java +0 -1
  146. Core/src/main/java/com/plotsquared/core/permissions/Permission.java +9 -5
  147. Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java +4 -4
  148. Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java +11 -10
  149. Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java +53 -91
  150. Core/src/main/java/com/plotsquared/core/plot/Plot.java +86 -133
  151. Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +20 -38
  152. Core/src/main/java/com/plotsquared/core/plot/PlotId.java +0 -11
  153. Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java +1 -1
  154. Core/src/main/java/com/plotsquared/core/plot/PlotManager.java +0 -9
  155. Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java +8 -3
  156. Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java +1 -14
  157. Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java +0 -8
  158. Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java +8 -4
  159. Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java +8 -20
  160. Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java +16 -34
  161. Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java +1 -0
  162. Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java +0 -8
  163. Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java +6 -6
  164. Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java +11 -9
  165. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java +1 -1
  166. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java +15 -19
  167. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java +1 -1
  168. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java +6 -4
  169. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java +5 -8
  170. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java +1 -1
  171. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java +6 -4
  172. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectilesFlag.java +1 -1
  173. Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java +4 -2
  174. Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java +4 -17
  175. Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java +3 -2
  176. Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java +3 -1
  177. Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java +1 -0
  178. Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java +2 -2
  179. Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java +6 -3
  180. Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinator.java +1 -0
  181. Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java +0 -163
  182. Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java +6 -25
  183. Core/src/main/java/com/plotsquared/core/queue/{ScopedQueueCoordinator.java → ZeroedDelegateScopedQueueCoordinator.java} +8 -6
  184. Core/src/main/java/com/plotsquared/core/queue/subscriber/DefaultProgressSubscriber.java +9 -7
  185. Core/src/main/java/com/plotsquared/core/services/plots/AutoQuery.java +94 -0
  186. Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java +10 -90
  187. Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java +7 -2
  188. Core/src/main/java/com/plotsquared/core/setup/PlotAreaBuilder.java +11 -2
  189. Core/src/main/java/com/plotsquared/core/setup/SettingsNodeStep.java +15 -8
  190. Core/src/main/java/com/plotsquared/core/setup/SettingsNodesWrapper.java +4 -17
  191. Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java +3 -3
  192. Core/src/main/java/com/plotsquared/core/util/BlockUtil.java +0 -36
  193. Core/src/main/java/com/plotsquared/core/util/ChunkManager.java +14 -17
  194. Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java +0 -24
  195. Core/src/main/java/com/plotsquared/core/util/ComponentHelper.java +65 -0
  196. Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java +36 -17
  197. Core/src/main/java/com/plotsquared/core/util/FileBytes.java +4 -9
  198. Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java +8 -6
  199. Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java +11 -5
  200. Core/src/main/java/com/plotsquared/core/util/MainUtil.java +0 -82
  201. Core/src/main/java/com/plotsquared/core/util/MathMan.java +0 -312
  202. Core/src/main/java/com/plotsquared/core/util/PatternUtil.java +4 -2
  203. Core/src/main/java/com/plotsquared/core/util/Permissions.java +0 -148
  204. Core/src/main/java/com/plotsquared/core/util/PlayerManager.java +19 -61
  205. Core/src/main/java/com/plotsquared/core/util/RegExUtil.java +0 -34
  206. Core/src/main/java/com/plotsquared/core/util/RegionManager.java +2 -12
  207. Core/src/main/java/com/plotsquared/core/util/RegionUtil.java +0 -17
  208. Core/src/main/java/com/plotsquared/core/util/StringMan.java +0 -241
  209. Core/src/main/java/com/plotsquared/core/util/TabCompletions.java +2 -56
  210. Core/src/main/java/com/plotsquared/core/util/WEManager.java +0 -52
  211. Core/src/main/java/com/plotsquared/core/util/WorldUtil.java +4 -24
  212. Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java +24 -17
  213. Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java +20 -24
  214. Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java +5 -15
  215. Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java +4 -2
  216. Core/src/main/java/com/plotsquared/core/uuid/CacheUUIDService.java +2 -2
  217. Core/src/main/java/com/plotsquared/core/uuid/UUIDMapping.java +4 -43
  218. Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java +15 -30
  219. Core/src/main/resources/lang/messages_en.json +15 -15
  220. Core/src/test/java/com/plotsquared/core/plot/FlagTest.java +1 -0
  221. Core/src/test/java/com/plotsquared/core/plot/PlotRangeIteratorTest.java +1 -0
  222. Core/src/test/java/com/plotsquared/core/synchronization/LockRepositoryTest.java +1 -0
  223. Core/src/test/java/com/plotsquared/core/util/StringManTest.java +5 -2
  224. README.md +15 -7
  225. build.gradle.kts +23 -6
  226. gradle/libs.versions.toml +9 -11
  227. gradle/wrapper/gradle-wrapper.jar +0 -0
  228. gradle/wrapper/gradle-wrapper.properties +1 -1
  229. gradlew +6 -5
  230. javadocfooter.html +3 -3
  231. renovate.json +4 -2
  232. settings.gradle.kts +2 -2
.github/ISSUE_TEMPLATE/bug_report.yml CHANGED
@@ -8,7 +8,7 @@ body:
8
8
  value: |
9
9
  Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
10
10
  Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
11
- Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form!
11
+ Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://github.com/IntellectualSites/PlotSquared/security/policy) GitHub form!
12
12
 
13
13
  - type: dropdown
14
14
  attributes:
@@ -27,6 +27,8 @@ body:
27
27
  description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
28
28
  multiple: false
29
29
  options:
30
+ - '1.20'
31
+ - '1.19.4'
30
32
  - '1.19.3'
31
33
  - '1.19.2'
32
34
  - '1.19.1'
.github/workflows/announce-release-on-discord.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  name: Announce release on discord
2
2
  on:
3
3
  release:
4
- types: [published]
4
+ types: [ published ]
5
5
  jobs:
6
6
  send_announcement:
7
7
  runs-on: ubuntu-latest
@@ -11,7 +11,7 @@ jobs:
11
11
  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
12
12
  DISCORD_USERNAME: PlotSquared Release
13
13
  DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
14
- uses: Ilshidur/action-discord@08d9328877d6954120eef2b07abbc79249bb6210 # ratchet:Ilshidur/action-discord@0.3.2
14
+ uses: Ilshidur/action-discord@0.3.2
15
15
  with:
16
16
  args: |
17
17
  "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"
.github/workflows/build-pr.yml CHANGED
@@ -1,17 +1,17 @@
1
1
  name: Build PR
2
- on: [pull_request]
2
+ on: [ pull_request ]
3
3
  jobs:
4
4
  build_pr:
5
5
  if: github.repository_owner == 'IntellectualSites'
6
6
  runs-on: ${{ matrix.os }}
7
7
  strategy:
8
8
  matrix:
9
- os: [ubuntu-latest, windows-latest, macos-latest]
9
+ os: [ ubuntu-latest, windows-latest, macos-latest ]
10
10
  steps:
11
11
  - name: Checkout Repository
12
12
  uses: actions/checkout@v3
13
13
  - name: Validate Gradle Wrapper
14
- uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
14
+ uses: gradle/wrapper-validation-action@v1
15
15
  - name: Setup Java
16
16
  uses: actions/setup-java@v3
17
17
  with:
.github/workflows/build.yml CHANGED
@@ -2,7 +2,7 @@ name: build
2
2
  on:
3
3
  push:
4
4
  branches:
5
- - v6
5
+ - main
6
6
  jobs:
7
7
  build:
8
8
  if: github.repository_owner == 'IntellectualSites'
@@ -11,7 +11,7 @@ jobs:
11
11
  - name: Checkout Repository
12
12
  uses: actions/checkout@v3
13
13
  - name: Validate Gradle Wrapper
14
- uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
14
+ uses: gradle/wrapper-validation-action@v1
15
15
  - name: Setup Java
16
16
  uses: actions/setup-java@v3
17
17
  with:
@@ -28,7 +28,7 @@ jobs:
28
28
  echo "STATUS=release" >> $GITHUB_ENV
29
29
  fi
30
30
  - name: Publish Release
31
- if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
31
+ if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
32
32
  run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
33
33
  env:
34
34
  ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -36,14 +36,14 @@ jobs:
36
36
  ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
37
37
  ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
38
38
  - name: Publish Snapshot
39
- if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6' }}
39
+ if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
40
40
  run: ./gradlew publishToSonatype
41
41
  env:
42
42
  ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
43
43
  ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
44
44
  - name: Publish core javadoc
45
- if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
46
- uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
45
+ # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
46
+ uses: cpina/github-action-push-to-another-repository@main
47
47
  env:
48
48
  SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
49
49
  with:
@@ -52,10 +52,10 @@ jobs:
52
52
  destination-repository-name: 'plotsquared-javadocs'
53
53
  user-email: ${{ secrets.USER_EMAIL }}
54
54
  target-branch: main
55
- target-directory: core
55
+ target-directory: v7/core
56
56
  - name: Publish bukkit javadoc
57
- if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
58
- uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
57
+ # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
58
+ uses: cpina/github-action-push-to-another-repository@main
59
59
  env:
60
60
  SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
61
61
  with:
@@ -64,4 +64,4 @@ jobs:
64
64
  destination-repository-name: 'plotsquared-javadocs'
65
65
  user-email: ${{ secrets.USER_EMAIL }}
66
66
  target-branch: main
67
- target-directory: bukkit
67
+ target-directory: v7/bukkit
.github/workflows/codeql.yml CHANGED
@@ -1,8 +1,11 @@
1
1
  name: "CodeQL"
2
2
  on:
3
+ push:
4
+ branches: [ main ]
3
5
  pull_request:
4
6
  # The branches below must be a subset of the branches above
5
- branches: [v6]
7
+ branches: [ main ]
8
+
6
9
  jobs:
7
10
  analyze:
8
11
  name: Analyze
@@ -14,15 +17,20 @@ jobs:
14
17
  strategy:
15
18
  fail-fast: false
16
19
  matrix:
17
- language: ['java']
20
+ language: [ 'java' ]
18
21
  steps:
19
22
  - name: Checkout repository
20
23
  uses: actions/checkout@v3
24
+ - name: Setup Java
25
+ uses: actions/setup-java@v3
26
+ with:
27
+ distribution: temurin
28
+ java-version: 17
21
29
  - name: Initialize CodeQL
22
- uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
30
+ uses: github/codeql-action/init@v2
23
31
  with:
24
32
  languages: ${{ matrix.language }}
25
33
  - name: Autobuild
26
- uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
34
+ uses: github/codeql-action/autobuild@v2
27
35
  - name: Perform CodeQL Analysis
28
- uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
36
+ uses: github/codeql-action/analyze@v2
.github/workflows/release-drafter.yml CHANGED
@@ -2,11 +2,11 @@ name: draft release
2
2
  on:
3
3
  push:
4
4
  branches:
5
- - v6
5
+ - main
6
6
  pull_request:
7
- types: [opened, reopened, synchronize]
7
+ types: [ opened, reopened, synchronize ]
8
8
  pull_request_target:
9
- types: [opened, reopened, synchronize]
9
+ types: [ opened, reopened, synchronize ]
10
10
  jobs:
11
11
  update_release_draft:
12
12
  if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
.gitignore CHANGED
@@ -137,3 +137,7 @@ docs/
137
137
  build/
138
138
 
139
139
  .DS_Store
140
+ # Ignore run folders
141
+ run-[0-0].[0-9]/
142
+ run-[0-0].[0-9].[0-9]/
143
+
.idea/icon.svg CHANGED
@@ -1,48 +1,144 @@
1
1
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
- <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" xml:space="preserve" width="4000" height="3333.3333" viewBox="0 0 4000 3333.3333" sodipodi:docname="PlotSquared.ai">
3
- <metadata id="metadata8">
2
+ <svg
3
+ version="1.1"
4
+ id="svg2"
5
+ xml:space="preserve"
6
+ width="512"
7
+ height="512"
8
+ viewBox="0 0 512 512.00001"
9
+ sodipodi:docname="icon.svg"
10
+ inkscape:version="1.1.2 (b8e25be8, 2022-02-05)"
11
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
13
+ xmlns="http://www.w3.org/2000/svg"
14
+ xmlns:svg="http://www.w3.org/2000/svg"
15
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
16
+ xmlns:cc="http://creativecommons.org/ns#"
17
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
18
+ <metadata
19
+ id="metadata8">
4
20
  <rdf:RDF>
5
- <cc:Work rdf:about="">
21
+ <cc:Work
22
+ rdf:about="">
6
23
  <dc:format>image/svg+xml</dc:format>
7
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
24
+ <dc:type
25
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
8
26
  </cc:Work>
9
27
  </rdf:RDF>
10
28
  </metadata>
11
- <defs id="defs6">
12
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
13
- <path d="M 0,2500 H 3000 V 0 H 0 Z" id="path16" />
29
+ <defs
30
+ id="defs6">
31
+ <clipPath
32
+ clipPathUnits="userSpaceOnUse"
33
+ id="clipPath18">
34
+ <path
35
+ d="M 0,2500 H 3000 V 0 H 0 Z"
36
+ id="path16" />
14
37
  </clipPath>
15
38
  </defs>
16
- <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" id="namedview4" />
17
- <g id="g10" inkscape:groupmode="layer" inkscape:label="PlotSquared" transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
18
- <g id="g12">
19
- <g id="g14" clip-path="url(#clipPath18)">
20
- <g id="g20" transform="translate(1486.1511,2242.6453)">
21
- <path d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0" style="fill:#062f4c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path22" />
39
+ <sodipodi:namedview
40
+ pagecolor="#ffffff"
41
+ bordercolor="#666666"
42
+ borderopacity="1"
43
+ objecttolerance="10"
44
+ gridtolerance="10"
45
+ guidetolerance="10"
46
+ inkscape:pageopacity="0"
47
+ inkscape:pageshadow="2"
48
+ inkscape:window-width="1440"
49
+ inkscape:window-height="900"
50
+ id="namedview4"
51
+ inkscape:pagecheckerboard="0"
52
+ showgrid="false"
53
+ inkscape:zoom="0.1632"
54
+ inkscape:cx="1087.6225"
55
+ inkscape:cy="1666.6666"
56
+ inkscape:window-x="0"
57
+ inkscape:window-y="0"
58
+ inkscape:window-maximized="0"
59
+ inkscape:current-layer="g10" />
60
+ <g
61
+ id="g10"
62
+ inkscape:groupmode="layer"
63
+ inkscape:label="PlotSquared"
64
+ transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
65
+ <g
66
+ id="g12"
67
+ transform="matrix(0.16955078,0,0,0.16955078,-68.456969,2101.8529)">
68
+ <g
69
+ id="g14"
70
+ clip-path="url(#clipPath18)">
71
+ <g
72
+ id="g20"
73
+ transform="translate(1486.1511,2242.6453)">
74
+ <path
75
+ d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0"
76
+ style="fill:#062f4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
77
+ id="path22" />
22
78
  </g>
23
- <g id="g24" transform="translate(1201.7948,1741.5303)">
24
- <path d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z" style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26" />
79
+ <g
80
+ id="g24"
81
+ transform="translate(1201.7948,1741.5303)">
82
+ <path
83
+ d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z"
84
+ style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none"
85
+ id="path26" />
25
86
  </g>
26
- <g id="g28" transform="translate(919.3342,1429.7462)">
27
- <path d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0" style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path30" />
87
+ <g
88
+ id="g28"
89
+ transform="translate(919.3342,1429.7462)">
90
+ <path
91
+ d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0"
92
+ style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none"
93
+ id="path30" />
28
94
  </g>
29
- <g id="g32" transform="translate(1649.134,1700.6166)">
30
- <path d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0" style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34" />
95
+ <g
96
+ id="g32"
97
+ transform="translate(1649.134,1700.6166)">
98
+ <path
99
+ d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0"
100
+ style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
101
+ id="path34" />
31
102
  </g>
32
- <g id="g36" transform="translate(1262.7214,1613.126)">
33
- <path d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667" style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path38" />
103
+ <g
104
+ id="g36"
105
+ transform="translate(1262.7214,1613.126)">
106
+ <path
107
+ d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667"
108
+ style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
109
+ id="path38" />
34
110
  </g>
35
- <g id="g40" transform="translate(1966.3174,1675.6364)">
36
- <path d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0" style="fill:#042338;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path42" />
111
+ <g
112
+ id="g40"
113
+ transform="translate(1966.3174,1675.6364)">
114
+ <path
115
+ d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0"
116
+ style="fill:#042338;fill-opacity:1;fill-rule:nonzero;stroke:none"
117
+ id="path42" />
37
118
  </g>
38
- <g id="g44" transform="translate(1499.3971,1669.1094)">
39
- <path d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path46" />
119
+ <g
120
+ id="g44"
121
+ transform="translate(1499.3971,1669.1094)">
122
+ <path
123
+ d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0"
124
+ style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
125
+ id="path46" />
40
126
  </g>
41
- <g id="g48" transform="translate(1748.0469,1601.6797)">
42
- <path d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path50" />
127
+ <g
128
+ id="g48"
129
+ transform="translate(1748.0469,1601.6797)">
130
+ <path
131
+ d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0"
132
+ style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
133
+ id="path50" />
43
134
  </g>
44
- <g id="g52" transform="translate(1262.7214,1613.126)">
45
- <path d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path54" />
135
+ <g
136
+ id="g52"
137
+ transform="translate(1262.7214,1613.126)">
138
+ <path
139
+ d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z"
140
+ style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
141
+ id="path54" />
46
142
  </g>
47
143
  </g>
48
144
  </g>
Bukkit/build.gradle.kts CHANGED
@@ -18,7 +18,7 @@ repositories {
18
18
  }
19
19
 
20
20
  dependencies {
21
- api(projects.plotSquaredCore)
21
+ api(projects.plotsquaredCore)
22
22
 
23
23
  // Metrics
24
24
  implementation("org.bstats:bstats-bukkit")
@@ -48,7 +48,6 @@ dependencies {
48
48
 
49
49
  // Our libraries
50
50
  implementation(libs.arkitektonika)
51
- implementation(libs.http4j)
52
51
  implementation("com.intellectualsites.paster:Paster")
53
52
  implementation("com.intellectualsites.informative-annotations:informative-annotations")
54
53
 
@@ -63,6 +62,7 @@ tasks.processResources {
63
62
  }
64
63
 
65
64
  tasks.named<ShadowJar>("shadowJar") {
65
+ dependsOn(":plotsquared-core:shadowJar")
66
66
  dependencies {
67
67
  exclude(dependency("org.checkerframework:"))
68
68
  }
@@ -88,7 +88,7 @@ tasks.named<ShadowJar>("shadowJar") {
88
88
  relocate("javax.inject", "com.plotsquared.core.annotation.inject")
89
89
  relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
90
90
  relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")
91
- relocate("com.intellectualsites.informative-annotations", "com.plotsquared.core.annotation.informative")
91
+ relocate("com.intellectualsites.annotations", "com.plotsquared.core.annotations.informative")
92
92
 
93
93
  // Get rid of all the libs which are 100% unused.
94
94
  minimize()
@@ -100,10 +100,10 @@ tasks {
100
100
  withType<Javadoc> {
101
101
  val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
102
102
  val opt = options as StandardJavadocDocletOptions
103
- opt.links("https://jd.papermc.io/paper/1.18/")
103
+ opt.links("https://jd.papermc.io/paper/1.19/")
104
104
  opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
105
105
  opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
106
- opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
106
+ opt.links("https://jd.advntr.dev/api/4.14.0/")
107
107
  opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
108
108
  opt.links("https://checkerframework.org/api/")
109
109
  opt.isLinkSource = true
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java CHANGED
@@ -49,6 +49,7 @@ import com.plotsquared.bukkit.player.BukkitPlayerManager;
49
49
  import com.plotsquared.bukkit.util.BukkitUtil;
50
50
  import com.plotsquared.bukkit.util.BukkitWorld;
51
51
  import com.plotsquared.bukkit.util.SetGenCB;
52
+ import com.plotsquared.bukkit.util.TranslationUpdateManager;
52
53
  import com.plotsquared.bukkit.util.UpdateUtility;
53
54
  import com.plotsquared.bukkit.util.task.BukkitTaskManager;
54
55
  import com.plotsquared.bukkit.util.task.PaperTimeConverter;
@@ -140,6 +141,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
140
141
  import org.incendo.serverlib.ServerLib;
141
142
 
142
143
  import java.io.File;
144
+ import java.io.IOException;
143
145
  import java.lang.reflect.Method;
144
146
  import java.util.ArrayList;
145
147
  import java.util.Arrays;
@@ -293,6 +295,12 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
293
295
  );
294
296
  this.injector.injectMembers(this);
295
297
 
298
+ try {
299
+ this.injector.getInstance(TranslationUpdateManager.class).upgradeTranslationFile();
300
+ } catch (IOException e) {
301
+ throw new RuntimeException(e);
302
+ }
303
+
296
304
  this.serverLocale = Locale.forLanguageTag(Settings.Enabled_Components.DEFAULT_LOCALE);
297
305
 
298
306
  if (PremiumVerification.isPremium() && Settings.Enabled_Components.UPDATE_NOTIFICATIONS) {
@@ -358,7 +366,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
358
366
  getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this);
359
367
  getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this);
360
368
  if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) {
361
- getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
369
+ getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
362
370
  } else {
363
371
  getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this);
364
372
  }
@@ -1177,9 +1185,17 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
1177
1185
  public @NonNull String worldEditImplementations() {
1178
1186
  StringBuilder msg = new StringBuilder();
1179
1187
  if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) {
1180
- msg.append("FastAsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit").getDescription().getVersion());
1188
+ msg.append("FastAsyncWorldEdit: ").append(Bukkit
1189
+ .getPluginManager()
1190
+ .getPlugin("FastAsyncWorldEdit")
1191
+ .getDescription()
1192
+ .getVersion());
1181
1193
  } else if (Bukkit.getPluginManager().getPlugin("AsyncWorldEdit") != null) {
1182
- msg.append("AsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("AsyncWorldEdit").getDescription().getVersion()).append("\n");
1194
+ msg.append("AsyncWorldEdit: ").append(Bukkit
1195
+ .getPluginManager()
1196
+ .getPlugin("AsyncWorldEdit")
1197
+ .getDescription()
1198
+ .getVersion()).append("\n");
1183
1199
  msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());
1184
1200
  } else {
1185
1201
  msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());
Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java CHANGED
@@ -101,50 +101,26 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
101
101
  this.noGravity = true;
102
102
  }
103
103
  switch (entity.getType().toString()) {
104
- case "BOAT":
104
+ case "BOAT" -> {
105
105
  Boat boat = (Boat) entity;
106
106
  this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
107
107
  return;
108
- case "ARROW":
109
- case "EGG":
110
- case "ENDER_CRYSTAL":
111
- case "ENDER_PEARL":
112
- case "ENDER_SIGNAL":
113
- case "EXPERIENCE_ORB":
114
- case "FALLING_BLOCK":
115
- case "FIREBALL":
116
- case "FIREWORK":
117
- case "FISHING_HOOK":
118
- case "LEASH_HITCH":
119
- case "LIGHTNING":
120
- case "MINECART":
121
- case "MINECART_COMMAND":
122
- case "MINECART_MOB_SPAWNER":
123
- case "MINECART_TNT":
124
- case "PLAYER":
125
- case "PRIMED_TNT":
126
- case "SLIME":
127
- case "SMALL_FIREBALL":
128
- case "SNOWBALL":
129
- case "MINECART_FURNACE":
130
- case "SPLASH_POTION":
131
- case "THROWN_EXP_BOTTLE":
132
- case "WITHER_SKULL":
133
- case "UNKNOWN":
134
- case "SPECTRAL_ARROW":
135
- case "SHULKER_BULLET":
136
- case "DRAGON_FIREBALL":
137
- case "AREA_EFFECT_CLOUD":
138
- case "TRIDENT":
139
- case "LLAMA_SPIT":
108
+ }
109
+ case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
110
+ "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
111
+ "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
112
+ "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
113
+ "TRIDENT", "LLAMA_SPIT" -> {
140
114
  // Do this stuff later
141
115
  return;
116
+ }
142
117
  // MISC //
143
- case "DROPPED_ITEM":
118
+ case "DROPPED_ITEM" -> {
144
119
  Item item = (Item) entity;
145
120
  this.stack = item.getItemStack();
146
121
  return;
147
- case "ITEM_FRAME":
122
+ }
123
+ case "ITEM_FRAME" -> {
148
124
  this.x = Math.floor(this.getX());
149
125
  this.y = Math.floor(this.getY());
150
126
  this.z = Math.floor(this.getZ());
@@ -152,7 +128,8 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
152
128
  this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
153
129
  this.stack = itemFrame.getItem().clone();
154
130
  return;
155
- case "PAINTING":
131
+ }
132
+ case "PAINTING" -> {
156
133
  this.x = Math.floor(this.getX());
157
134
  this.y = Math.floor(this.getY());
158
135
  this.z = Math.floor(this.getZ());
@@ -165,20 +142,17 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
165
142
  }
166
143
  this.dataString = art.name();
167
144
  return;
145
+ }
168
146
  // END MISC //
169
147
  // INVENTORY HOLDER //
170
- case "MINECART_CHEST":
171
- case "MINECART_HOPPER":
148
+ case "MINECART_CHEST", "MINECART_HOPPER" -> {
172
149
  storeInventory((InventoryHolder) entity);
173
150
  return;
151
+ }
174
152
  // START LIVING ENTITY //
175
153
  // START AGEABLE //
176
154
  // START TAMEABLE //
177
- case "HORSE":
178
- case "DONKEY":
179
- case "LLAMA":
180
- case "MULE":
181
- case "SKELETON_HORSE":
155
+ case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
182
156
  AbstractHorse horse = (AbstractHorse) entity;
183
157
  this.horse = new HorseStats();
184
158
  this.horse.jump = horse.getJumpStrength();
@@ -194,16 +168,17 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
194
168
  storeLiving(horse);
195
169
  storeInventory(horse);
196
170
  return;
171
+ }
197
172
  // END INVENTORY HOLDER //
198
- case "WOLF":
199
- case "OCELOT":
173
+ case "WOLF", "OCELOT" -> {
200
174
  storeTameable((Tameable) entity);
201
175
  storeAgeable((Ageable) entity);
202
176
  storeLiving((LivingEntity) entity);
203
177
  return;
178
+ }
204
179
  // END TAMEABLE //
205
180
  //todo fix sheep
206
- case "SHEEP":
181
+ case "SHEEP" -> {
207
182
  Sheep sheep = (Sheep) entity;
208
183
  if (sheep.isSheared()) {
209
184
  this.dataByte = (byte) 1;
@@ -214,23 +189,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
214
189
  storeAgeable(sheep);
215
190
  storeLiving(sheep);
216
191
  return;
217
- case "VILLAGER":
218
- case "CHICKEN":
219
- case "COW":
220
- case "MUSHROOM_COW":
221
- case "PIG":
222
- case "TURTLE":
223
- case "POLAR_BEAR":
192
+ }
193
+ case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
224
194
  storeAgeable((Ageable) entity);
225
195
  storeLiving((LivingEntity) entity);
226
196
  return;
227
- case "RABBIT":
197
+ }
198
+ case "RABBIT" -> {
228
199
  this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
229
200
  storeAgeable((Ageable) entity);
230
201
  storeLiving((LivingEntity) entity);
231
202
  return;
203
+ }
232
204
  // END AGEABLE //
233
- case "ARMOR_STAND":
205
+ case "ARMOR_STAND" -> {
234
206
  ArmorStand stand = (ArmorStand) entity;
235
207
  this.inventory =
236
208
  new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(),
@@ -238,37 +210,30 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
238
210
  stand.getBoots().clone()};
239
211
  storeLiving(stand);
240
212
  this.stand = new ArmorStandStats();
241
-
242
213
  EulerAngle head = stand.getHeadPose();
243
214
  this.stand.head[0] = (float) head.getX();
244
215
  this.stand.head[1] = (float) head.getY();
245
216
  this.stand.head[2] = (float) head.getZ();
246
-
247
217
  EulerAngle body = stand.getBodyPose();
248
218
  this.stand.body[0] = (float) body.getX();
249
219
  this.stand.body[1] = (float) body.getY();
250
220
  this.stand.body[2] = (float) body.getZ();
251
-
252
221
  EulerAngle leftLeg = stand.getLeftLegPose();
253
222
  this.stand.leftLeg[0] = (float) leftLeg.getX();
254
223
  this.stand.leftLeg[1] = (float) leftLeg.getY();
255
224
  this.stand.leftLeg[2] = (float) leftLeg.getZ();
256
-
257
225
  EulerAngle rightLeg = stand.getRightLegPose();
258
226
  this.stand.rightLeg[0] = (float) rightLeg.getX();
259
227
  this.stand.rightLeg[1] = (float) rightLeg.getY();
260
228
  this.stand.rightLeg[2] = (float) rightLeg.getZ();
261
-
262
229
  EulerAngle leftArm = stand.getLeftArmPose();
263
230
  this.stand.leftArm[0] = (float) leftArm.getX();
264
231
  this.stand.leftArm[1] = (float) leftArm.getY();
265
232
  this.stand.leftArm[2] = (float) leftArm.getZ();
266
-
267
233
  EulerAngle rightArm = stand.getRightArmPose();
268
234
  this.stand.rightArm[0] = (float) rightArm.getX();
269
235
  this.stand.rightArm[1] = (float) rightArm.getY();
270
236
  this.stand.rightArm[2] = (float) rightArm.getZ();
271
-
272
237
  if (stand.hasArms()) {
273
238
  this.stand.arms = true;
274
239
  }
@@ -282,53 +247,38 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
282
247
  this.stand.small = true;
283
248
  }
284
249
  return;
285
- case "ENDERMITE":
250
+ }
251
+ case "ENDERMITE" -> {
286
252
  return;
287
- case "BAT":
253
+ }
254
+ case "BAT" -> {
288
255
  if (((Bat) entity).isAwake()) {
289
256
  this.dataByte = (byte) 1;
290
257
  } else {
291
258
  this.dataByte = (byte) 0;
292
259
  }
293
260
  return;
294
- case "ENDER_DRAGON":
261
+ }
262
+ case "ENDER_DRAGON" -> {
295
263
  EnderDragon entity1 = (EnderDragon) entity;
296
264
  this.dataByte = (byte) entity1.getPhase().ordinal();
297
265
  return;
298
- case "SKELETON":
299
- case "WITHER_SKELETON":
300
- case "GUARDIAN":
301
- case "ELDER_GUARDIAN":
302
- case "GHAST":
303
- case "MAGMA_CUBE":
304
- case "SQUID":
305
- case "PIG_ZOMBIE":
306
- case "HOGLIN":
307
- case "ZOMBIFIED_PIGLIN":
308
- case "PIGLIN":
309
- case "PIGLIN_BRUTE":
310
- case "ZOMBIE":
311
- case "WITHER":
312
- case "WITCH":
313
- case "SPIDER":
314
- case "CAVE_SPIDER":
315
- case "SILVERFISH":
316
- case "GIANT":
317
- case "ENDERMAN":
318
- case "CREEPER":
319
- case "BLAZE":
320
- case "SHULKER":
321
- case "SNOWMAN":
266
+ }
267
+ case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
268
+ "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
269
+ "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
322
270
  storeLiving((LivingEntity) entity);
323
271
  return;
324
- case "IRON_GOLEM":
272
+ }
273
+ case "IRON_GOLEM" -> {
325
274
  if (((IronGolem) entity).isPlayerCreated()) {
326
275
  this.dataByte = (byte) 1;
327
276
  } else {
328
277
  this.dataByte = (byte) 0;
329
278
  }
330
279
  storeLiving((LivingEntity) entity);
331
- // END LIVING //
280
+ }
281
+ // END LIVING //
332
282
  }
333
283
  }
334
284
 
@@ -465,20 +415,15 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
465
415
  }
466
416
  Entity entity;
467
417
  switch (this.getType().toString()) {
468
- case "DROPPED_ITEM":
418
+ case "DROPPED_ITEM" -> {
469
419
  return world.dropItem(location, this.stack);
470
- case "PLAYER":
471
- case "LEASH_HITCH":
420
+ }
421
+ case "PLAYER", "LEASH_HITCH" -> {
472
422
  return null;
473
- case "ITEM_FRAME":
474
- entity = world.spawn(location, ItemFrame.class);
475
- break;
476
- case "PAINTING":
477
- entity = world.spawn(location, Painting.class);
478
- break;
479
- default:
480
- entity = world.spawnEntity(location, this.getType());
481
- break;
423
+ }
424
+ case "ITEM_FRAME" -> entity = world.spawn(location, ItemFrame.class);
425
+ case "PAINTING" -> entity = world.spawn(location, Painting.class);
426
+ default -> entity = world.spawnEntity(location, this.getType());
482
427
  }
483
428
  if (this.depth == 0) {
484
429
  return entity;
@@ -506,72 +451,46 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
506
451
  entity.setGravity(false);
507
452
  }
508
453
  switch (entity.getType().toString()) {
509
- case "BOAT":
454
+ case "BOAT" -> {
510
455
  Boat boat = (Boat) entity;
511
456
  boat.setWoodType(TreeSpecies.values()[dataByte]);
512
457
  return entity;
513
- case "SLIME":
458
+ }
459
+ case "SLIME" -> {
514
460
  ((Slime) entity).setSize(this.dataByte);
515
461
  return entity;
516
- case "ARROW":
517
- case "EGG":
518
- case "ENDER_CRYSTAL":
519
- case "ENDER_PEARL":
520
- case "ENDER_SIGNAL":
521
- case "DROPPED_ITEM":
522
- case "EXPERIENCE_ORB":
523
- case "FALLING_BLOCK":
524
- case "FIREBALL":
525
- case "FIREWORK":
526
- case "FISHING_HOOK":
527
- case "LEASH_HITCH":
528
- case "LIGHTNING":
529
- case "MINECART":
530
- case "MINECART_COMMAND":
531
- case "MINECART_MOB_SPAWNER":
532
- case "MINECART_TNT":
533
- case "PLAYER":
534
- case "PRIMED_TNT":
535
- case "SMALL_FIREBALL":
536
- case "SNOWBALL":
537
- case "SPLASH_POTION":
538
- case "THROWN_EXP_BOTTLE":
539
- case "SPECTRAL_ARROW":
540
- case "SHULKER_BULLET":
541
- case "AREA_EFFECT_CLOUD":
542
- case "DRAGON_FIREBALL":
543
- case "WITHER_SKULL":
544
- case "MINECART_FURNACE":
545
- case "LLAMA_SPIT":
546
- case "TRIDENT":
547
- case "UNKNOWN":
462
+ }
463
+ case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
464
+ "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
465
+ "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
466
+ "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
467
+ "DRAGON_FIREBALL", "WITHER_SKULL", "MINECART_FURNACE", "LLAMA_SPIT", "TRIDENT", "UNKNOWN" -> {
548
468
  // Do this stuff later
549
469
  return entity;
470
+ }
550
471
  // MISC //
551
- case "ITEM_FRAME":
472
+ case "ITEM_FRAME" -> {
552
473
  ItemFrame itemframe = (ItemFrame) entity;
553
474
  itemframe.setRotation(Rotation.values()[this.dataByte]);
554
475
  itemframe.setItem(this.stack);
555
476
  return entity;
556
- case "PAINTING":
477
+ }
478
+ case "PAINTING" -> {
557
479
  Painting painting = (Painting) entity;
558
480
  painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
559
481
  painting.setArt(Art.getByName(this.dataString), true);
560
482
  return entity;
483
+ }
561
484
  // END MISC //
562
485
  // INVENTORY HOLDER //
563
- case "MINECART_CHEST":
564
- case "MINECART_HOPPER":
486
+ case "MINECART_CHEST", "MINECART_HOPPER" -> {
565
487
  restoreInventory((InventoryHolder) entity);
566
488
  return entity;
489
+ }
567
490
  // START LIVING ENTITY //
568
491
  // START AGEABLE //
569
492
  // START TAMEABLE //
570
- case "HORSE":
571
- case "LLAMA":
572
- case "SKELETON_HORSE":
573
- case "DONKEY":
574
- case "MULE":
493
+ case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
575
494
  AbstractHorse horse = (AbstractHorse) entity;
576
495
  horse.setJumpStrength(this.horse.jump);
577
496
  if (horse instanceof ChestedHorse) {
@@ -586,15 +505,16 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
586
505
  restoreLiving(horse);
587
506
  restoreInventory(horse);
588
507
  return entity;
508
+ }
589
509
  // END INVENTORY HOLDER //
590
- case "WOLF":
591
- case "OCELOT":
510
+ case "WOLF", "OCELOT" -> {
592
511
  restoreTameable((Tameable) entity);
593
512
  restoreAgeable((Ageable) entity);
594
513
  restoreLiving((LivingEntity) entity);
595
514
  return entity;
515
+ }
596
516
  // END AGEABLE //
597
- case "SHEEP":
517
+ case "SHEEP" -> {
598
518
  Sheep sheep = (Sheep) entity;
599
519
  if (this.dataByte == 1) {
600
520
  sheep.setSheared(true);
@@ -605,25 +525,22 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
605
525
  restoreAgeable(sheep);
606
526
  restoreLiving(sheep);
607
527
  return sheep;
608
- case "VILLAGER":
609
- case "CHICKEN":
610
- case "COW":
611
- case "TURTLE":
612
- case "POLAR_BEAR":
613
- case "MUSHROOM_COW":
614
- case "PIG":
528
+ }
529
+ case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
615
530
  restoreAgeable((Ageable) entity);
616
531
  restoreLiving((LivingEntity) entity);
617
532
  return entity;
533
+ }
618
534
  // END AGEABLE //
619
- case "RABBIT":
535
+ case "RABBIT" -> {
620
536
  if (this.dataByte != 0) {
621
537
  ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
622
538
  }
623
539
  restoreAgeable((Ageable) entity);
624
540
  restoreLiving((LivingEntity) entity);
625
541
  return entity;
626
- case "ARMOR_STAND":
542
+ }
543
+ case "ARMOR_STAND" -> {
627
544
  // CHECK positions
628
545
  ArmorStand stand = (ArmorStand) entity;
629
546
  if (this.inventory[0] != null) {
@@ -693,56 +610,38 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
693
610
  }
694
611
  restoreLiving(stand);
695
612
  return stand;
696
- case "BAT":
613
+ }
614
+ case "BAT" -> {
697
615
  if (this.dataByte != 0) {
698
616
  ((Bat) entity).setAwake(true);
699
617
  }
700
618
  restoreLiving((LivingEntity) entity);
701
619
  return entity;
702
- case "ENDER_DRAGON":
620
+ }
621
+ case "ENDER_DRAGON" -> {
703
622
  if (this.dataByte != 0) {
704
623
  ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
705
624
  }
706
625
  restoreLiving((LivingEntity) entity);
707
626
  return entity;
708
- case "ENDERMITE":
709
- case "GHAST":
710
- case "MAGMA_CUBE":
711
- case "SQUID":
712
- case "PIG_ZOMBIE":
713
- case "HOGLIN":
714
- case "PIGLIN":
715
- case "ZOMBIFIED_PIGLIN":
716
- case "PIGLIN_BRUTE":
717
- case "ZOMBIE":
718
- case "WITHER":
719
- case "WITCH":
720
- case "SPIDER":
721
- case "CAVE_SPIDER":
722
- case "SILVERFISH":
723
- case "GIANT":
724
- case "ENDERMAN":
725
- case "CREEPER":
726
- case "BLAZE":
727
- case "SNOWMAN":
728
- case "SHULKER":
729
- case "GUARDIAN":
730
- case "ELDER_GUARDIAN":
731
- case "SKELETON":
732
- case "WITHER_SKELETON":
627
+ }
628
+ case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
733
629
  restoreLiving((LivingEntity) entity);
734
630
  return entity;
735
- case "IRON_GOLEM":
631
+ }
632
+ case "IRON_GOLEM" -> {
736
633
  if (this.dataByte != 0) {
737
634
  ((IronGolem) entity).setPlayerCreated(true);
738
635
  }
739
636
  restoreLiving((LivingEntity) entity);
740
637
  return entity;
741
- default:
638
+ }
639
+ default -> {
742
640
  if (Settings.DEBUG) {
743
641
  LOGGER.info("Could not identify entity: {}", entity.getType());
744
642
  }
745
643
  return entity;
644
+ }
746
645
  // END LIVING
747
646
  }
748
647
  }
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java CHANGED
@@ -24,9 +24,8 @@ import com.plotsquared.core.generator.IndependentPlotGenerator;
24
24
  import com.plotsquared.core.location.Location;
25
25
  import com.plotsquared.core.location.UncheckedWorldLocation;
26
26
  import com.plotsquared.core.plot.PlotArea;
27
- import com.plotsquared.core.plot.world.PlotAreaManager;
28
27
  import com.plotsquared.core.plot.world.SinglePlotArea;
29
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
28
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
30
29
  import org.bukkit.generator.BlockPopulator;
31
30
  import org.bukkit.generator.LimitedRegion;
32
31
  import org.bukkit.generator.WorldInfo;
@@ -47,17 +46,6 @@ final class BlockStatePopulator extends BlockPopulator {
47
46
  this.plotGenerator = plotGenerator;
48
47
  }
49
48
 
50
- /**
51
- * @deprecated Use {@link BlockStatePopulator#BlockStatePopulator(IndependentPlotGenerator)} as plotAreManager is unused
52
- */
53
- @Deprecated(forRemoval = true, since = "6.9.0")
54
- public BlockStatePopulator(
55
- final @NonNull IndependentPlotGenerator plotGenerator,
56
- final @NonNull PlotAreaManager plotAreaManager
57
- ) {
58
- this.plotGenerator = plotGenerator;
59
- }
60
-
61
49
  @Override
62
50
  public void populate(
63
51
  @NonNull final WorldInfo worldInfo,
@@ -80,7 +68,7 @@ final class BlockStatePopulator extends BlockPopulator {
80
68
  worldInfo.getMaxHeight(),
81
69
  (chunkZ << 4) + 15
82
70
  );
83
- ScopedQueueCoordinator offsetChunkQueue = new ScopedQueueCoordinator(wrapped, min, max);
71
+ ZeroedDelegateScopedQueueCoordinator offsetChunkQueue = new ZeroedDelegateScopedQueueCoordinator(wrapped, min, max);
84
72
  this.plotGenerator.populateChunk(offsetChunkQueue, area);
85
73
  }
86
74
 
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java CHANGED
@@ -22,28 +22,46 @@ import com.plotsquared.bukkit.queue.GenChunk;
22
22
  import com.plotsquared.bukkit.util.BukkitUtil;
23
23
  import com.plotsquared.bukkit.util.BukkitWorld;
24
24
  import com.plotsquared.core.PlotSquared;
25
+ import com.plotsquared.core.generator.ClassicPlotWorld;
25
26
  import com.plotsquared.core.generator.GeneratorWrapper;
26
27
  import com.plotsquared.core.generator.IndependentPlotGenerator;
27
28
  import com.plotsquared.core.generator.SingleWorldGenerator;
28
29
  import com.plotsquared.core.location.ChunkWrapper;
30
+ import com.plotsquared.core.location.UncheckedWorldLocation;
29
31
  import com.plotsquared.core.plot.PlotArea;
30
32
  import com.plotsquared.core.plot.world.PlotAreaManager;
31
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
33
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
32
34
  import com.plotsquared.core.util.ChunkManager;
35
+ import com.sk89q.worldedit.bukkit.BukkitAdapter;
33
36
  import com.sk89q.worldedit.math.BlockVector2;
37
+ import org.apache.logging.log4j.LogManager;
38
+ import org.apache.logging.log4j.Logger;
39
+ import org.bukkit.HeightMap;
40
+ import org.bukkit.NamespacedKey;
41
+ import org.bukkit.Registry;
34
42
  import org.bukkit.World;
35
43
  import org.bukkit.block.Biome;
44
+ import org.bukkit.generator.BiomeProvider;
36
45
  import org.bukkit.generator.BlockPopulator;
37
46
  import org.bukkit.generator.ChunkGenerator;
47
+ import org.bukkit.generator.WorldInfo;
38
48
  import org.checkerframework.checker.nullness.qual.NonNull;
49
+ import org.jetbrains.annotations.NotNull;
50
+ import org.jetbrains.annotations.Nullable;
39
51
 
40
52
  import java.util.ArrayList;
53
+ import java.util.Arrays;
54
+ import java.util.EnumSet;
41
55
  import java.util.List;
42
56
  import java.util.Random;
43
57
  import java.util.Set;
44
58
 
59
+ import static java.util.function.Predicate.not;
60
+
45
61
  public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrapper<ChunkGenerator> {
46
62
 
63
+ private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName());
64
+
47
65
  @SuppressWarnings("unused")
48
66
  public final boolean PAPER_ASYNC_SAFE = true;
49
67
 
@@ -52,9 +70,15 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
52
70
  private final ChunkGenerator platformGenerator;
53
71
  private final boolean full;
54
72
  private final String levelName;
73
+ private final boolean useNewGenerationMethods;
74
+ private final BiomeProvider biomeProvider;
55
75
  private List<BlockPopulator> populators;
56
76
  private boolean loaded = false;
57
77
 
78
+ private PlotArea lastPlotArea;
79
+ private int lastChunkX = Integer.MIN_VALUE;
80
+ private int lastChunkZ = Integer.MIN_VALUE;
81
+
58
82
  public BukkitPlotGenerator(
59
83
  final @NonNull String name,
60
84
  final @NonNull IndependentPlotGenerator generator,
@@ -72,18 +96,23 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
72
96
  this.populators.add(new LegacyBlockStatePopulator(this.plotGenerator));
73
97
  }
74
98
  this.full = true;
99
+ this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
100
+ this.biomeProvider = new BukkitPlotBiomeProvider();
75
101
  }
76
102
 
77
103
  public BukkitPlotGenerator(final String world, final ChunkGenerator cg, final @NonNull PlotAreaManager plotAreaManager) {
78
104
  if (cg instanceof BukkitPlotGenerator) {
79
- throw new IllegalArgumentException("ChunkGenerator: " + cg.getClass().getName()
80
- + " is already a BukkitPlotGenerator!");
105
+ throw new IllegalArgumentException("ChunkGenerator: " + cg
106
+ .getClass()
107
+ .getName() + " is already a BukkitPlotGenerator!");
81
108
  }
82
109
  this.plotAreaManager = plotAreaManager;
83
110
  this.levelName = world;
84
111
  this.full = false;
85
112
  this.platformGenerator = cg;
86
113
  this.plotGenerator = new DelegatePlotGenerator(cg, world);
114
+ this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
115
+ this.biomeProvider = null;
87
116
  }
88
117
 
89
118
  @Override
@@ -111,7 +140,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
111
140
  try {
112
141
  checkLoaded(world);
113
142
  } catch (Exception e) {
114
- e.printStackTrace();
143
+ LOGGER.error("Error attempting to load world into PlotSquared.", e);
115
144
  }
116
145
  ArrayList<BlockPopulator> toAdd = new ArrayList<>();
117
146
  List<BlockPopulator> existing = world.getPopulators();
@@ -128,6 +157,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
128
157
  return toAdd;
129
158
  }
130
159
 
160
+ // Extracted to synchronized method for thread-safety, preventing multiple internal world load calls
131
161
  private synchronized void checkLoaded(@NonNull World world) {
132
162
  // Do not attempt to load configurations until WorldEdit has a platform ready.
133
163
  if (!PlotSquared.get().isWeInitialised()) {
@@ -153,7 +183,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
153
183
  }
154
184
  }
155
185
 
156
- @SuppressWarnings("deprecation")
186
+ @SuppressWarnings("deprecation") // Kept for compatibility with <=1.17.1
157
187
  private void setSpawnLimits(@NonNull World world, int limit) {
158
188
  world.setAmbientSpawnLimit(limit);
159
189
  world.setAnimalSpawnLimit(limit);
@@ -161,17 +191,118 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
161
191
  world.setWaterAnimalSpawnLimit(limit);
162
192
  }
163
193
 
194
+ @Override
195
+ public void generateNoise(
196
+ @NotNull final WorldInfo worldInfo,
197
+ @NotNull final Random random,
198
+ final int chunkX,
199
+ final int chunkZ,
200
+ @NotNull final ChunkData chunkData
201
+ ) {
202
+ if (this.platformGenerator != this) {
203
+ this.platformGenerator.generateNoise(worldInfo, random, chunkX, chunkZ, chunkData);
204
+ return;
205
+ }
206
+ int minY = chunkData.getMinHeight();
207
+ int maxY = chunkData.getMaxHeight();
208
+ GenChunk result = new GenChunk(minY, maxY);
209
+ // Set the chunk location
210
+ result.setChunk(new ChunkWrapper(worldInfo.getName(), chunkX, chunkZ));
211
+ // Set the result data
212
+ result.setChunkData(chunkData);
213
+ result.result = null;
214
+
215
+ // Catch any exceptions (as exceptions usually thrown)
216
+ try {
217
+ generate(BlockVector2.at(chunkX, chunkZ), worldInfo.getName(), result, false);
218
+ } catch (Throwable e) {
219
+ LOGGER.error("Error attempting to generate chunk.", e);
220
+ }
221
+ }
222
+
223
+ @Override
224
+ public void generateSurface(
225
+ @NotNull final WorldInfo worldInfo,
226
+ @NotNull final Random random,
227
+ final int chunkX,
228
+ final int chunkZ,
229
+ @NotNull final ChunkData chunkData
230
+ ) {
231
+ if (platformGenerator != this) {
232
+ platformGenerator.generateSurface(worldInfo, random, chunkX, chunkZ, chunkData);
233
+ }
234
+ }
235
+
236
+ @Override
237
+ public void generateBedrock(
238
+ @NotNull final WorldInfo worldInfo,
239
+ @NotNull final Random random,
240
+ final int chunkX,
241
+ final int chunkZ,
242
+ @NotNull final ChunkData chunkData
243
+ ) {
244
+ if (platformGenerator != this) {
245
+ platformGenerator.generateBedrock(worldInfo, random, chunkX, chunkZ, chunkData);
246
+ }
247
+ }
248
+
249
+ @Override
250
+ public void generateCaves(
251
+ @NotNull final WorldInfo worldInfo,
252
+ @NotNull final Random random,
253
+ final int chunkX,
254
+ final int chunkZ,
255
+ @NotNull final ChunkData chunkData
256
+ ) {
257
+ if (platformGenerator != this) {
258
+ platformGenerator.generateCaves(worldInfo, random, chunkX, chunkZ, chunkData);
259
+ }
260
+ }
261
+
262
+ @Override
263
+ public @Nullable BiomeProvider getDefaultBiomeProvider(@NotNull final WorldInfo worldInfo) {
264
+ if (platformGenerator != this) {
265
+ return platformGenerator.getDefaultBiomeProvider(worldInfo);
266
+ }
267
+ return biomeProvider;
268
+ }
269
+
270
+ @Override
271
+ public int getBaseHeight(
272
+ @NotNull final WorldInfo worldInfo,
273
+ @NotNull final Random random,
274
+ final int x,
275
+ final int z,
276
+ @NotNull final HeightMap heightMap
277
+ ) {
278
+ PlotArea area = getPlotArea(worldInfo.getName(), x, z);
279
+ if (area instanceof ClassicPlotWorld cpw) {
280
+ // Default to plot height being the heighest point before decoration (i.e. roads, walls etc.)
281
+ return cpw.PLOT_HEIGHT;
282
+ }
283
+ return super.getBaseHeight(worldInfo, random, x, z, heightMap);
284
+ }
285
+
164
286
  /**
165
287
  * The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
166
288
  * The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
167
289
  * release.
168
290
  */
169
- @Deprecated(forRemoval = true, since = "6.11.0")
291
+ @SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
170
292
  @Override
293
+ @Deprecated(since = "7.0.0")
171
294
  public @NonNull ChunkData generateChunkData(
172
- @NonNull World world, @NonNull Random random, int x, int z,
173
- @NonNull BiomeGrid biome
295
+ @NonNull World world, @NonNull Random random, int x, int z, @NonNull BiomeGrid biome
174
296
  ) {
297
+ if (useNewGenerationMethods) {
298
+ if (this.platformGenerator != this) {
299
+ return this.platformGenerator.generateChunkData(world, random, x, z, biome);
300
+ } else {
301
+ // Throw exception to be caught by the server that indicates the new generation API is being used.
302
+ throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
303
+ }
304
+ }
305
+
175
306
  int minY = BukkitWorld.getMinWorldHeight(world);
176
307
  int maxY = BukkitWorld.getMaxWorldHeight(world);
177
308
  GenChunk result = new GenChunk(minY, maxY);
@@ -181,7 +312,6 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
181
312
  for (int chunkZ = 0; chunkZ < 16; chunkZ++) {
182
313
  for (int y = minY; y < maxY; y++) {
183
314
  biome.setBiome(chunkX, y, chunkZ, Biome.PLAINS);
184
-
185
315
  }
186
316
  }
187
317
  }
@@ -201,35 +331,32 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
201
331
  if (this.platformGenerator != this) {
202
332
  return this.platformGenerator.generateChunkData(world, random, x, z, biome);
203
333
  } else {
204
- generate(BlockVector2.at(x, z), world, result);
334
+ generate(BlockVector2.at(x, z), world.getName(), result, true);
205
335
  }
206
336
  } catch (Throwable e) {
207
- e.printStackTrace();
337
+ LOGGER.error("Error attempting to load world into PlotSquared.", e);
208
338
  }
209
339
  // Return the result data
210
340
  return result.getChunkData();
211
341
  }
212
342
 
213
- private void generate(BlockVector2 loc, World world, ScopedQueueCoordinator result) {
343
+ private void generate(BlockVector2 loc, String world, ZeroedDelegateScopedQueueCoordinator result, boolean biomes) {
214
344
  // Load if improperly loaded
215
345
  if (!this.loaded) {
216
- checkLoaded(world);
346
+ synchronized (this) {
347
+ PlotSquared.get().loadWorld(world, this);
348
+ }
217
349
  }
218
350
  // Process the chunk
219
351
  if (ChunkManager.preProcessChunk(loc, result)) {
220
352
  return;
221
353
  }
222
- PlotArea area = this.plotAreaManager.getPlotArea(world.getName(), null);
223
- if (area == null && (area = this.plotAreaManager.getPlotArea(this.levelName, null)) == null) {
224
- throw new IllegalStateException(
225
- "Cannot regenerate chunk that does not belong to a plot area." + " Location: " + loc
226
- + ", world: " + world);
227
- }
354
+ PlotArea area = getPlotArea(world, loc.getX(), loc.getZ());
228
355
  try {
229
- this.plotGenerator.generateChunk(result, area);
356
+ this.plotGenerator.generateChunk(result, area, biomes);
230
357
  } catch (Throwable e) {
231
358
  // Recover from generator error
232
- e.printStackTrace();
359
+ LOGGER.error("Error attempting to generate chunk.", e);
233
360
  }
234
361
  ChunkManager.postProcessChunk(loc, result);
235
362
  }
@@ -283,4 +410,59 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
283
410
  return this.levelName;
284
411
  }
285
412
 
413
+ private synchronized PlotArea getPlotArea(String name, int chunkX, int chunkZ) {
414
+ // Load if improperly loaded
415
+ if (!this.loaded) {
416
+ PlotSquared.get().loadWorld(name, this);
417
+ // Do not set loaded to true as we want to ensure spawn limits are set when "loading" is actually able to be
418
+ // completed properly.
419
+ }
420
+ if (lastPlotArea != null && name.equals(this.levelName) && chunkX == lastChunkX && chunkZ == lastChunkZ) {
421
+ return lastPlotArea;
422
+ }
423
+ PlotArea area = UncheckedWorldLocation.at(name, chunkX << 4, 0, chunkZ << 4).getPlotArea();
424
+ if (area == null) {
425
+ throw new IllegalStateException(String.format(
426
+ "Cannot generate chunk that does not belong to a plot area. World: %s",
427
+ name
428
+ ));
429
+ }
430
+ this.lastChunkX = chunkX;
431
+ this.lastChunkZ = chunkZ;
432
+ return this.lastPlotArea = area;
433
+ }
434
+
435
+ /**
436
+ * Biome provider should never need to be accessed outside of this class.
437
+ */
438
+ private final class BukkitPlotBiomeProvider extends BiomeProvider {
439
+
440
+ private static final List<Biome> BIOMES;
441
+
442
+ static {
443
+ Set<Biome> disabledBiomes = EnumSet.of(Biome.CUSTOM);
444
+ if (PlotSquared.platform().serverVersion()[1] <= 19) {
445
+ final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
446
+ if (cherryGrove != null) {
447
+ disabledBiomes.add(cherryGrove);
448
+ }
449
+ }
450
+ BIOMES = Arrays.stream(Biome.values())
451
+ .filter(not(disabledBiomes::contains))
452
+ .toList();
453
+ }
454
+
455
+ @Override
456
+ public @NotNull Biome getBiome(@NotNull final WorldInfo worldInfo, final int x, final int y, final int z) {
457
+ PlotArea area = getPlotArea(worldInfo.getName(), x >> 4, z >> 4);
458
+ return BukkitAdapter.adapt(plotGenerator.getBiome(area, x, y, z));
459
+ }
460
+
461
+ @Override
462
+ public @NotNull List<Biome> getBiomes(@NotNull final WorldInfo worldInfo) {
463
+ return BIOMES; // Allow all biomes
464
+ }
465
+
466
+ }
467
+
286
468
  }
Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java CHANGED
@@ -24,9 +24,10 @@ import com.plotsquared.core.generator.IndependentPlotGenerator;
24
24
  import com.plotsquared.core.location.Location;
25
25
  import com.plotsquared.core.plot.PlotArea;
26
26
  import com.plotsquared.core.plot.PlotId;
27
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
27
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
28
28
  import com.plotsquared.core.util.MathMan;
29
29
  import com.sk89q.worldedit.bukkit.BukkitAdapter;
30
+ import com.sk89q.worldedit.world.biome.BiomeType;
30
31
  import org.bukkit.World;
31
32
  import org.bukkit.block.Biome;
32
33
  import org.bukkit.generator.BlockPopulator;
@@ -49,6 +50,11 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
49
50
  public void initialize(PlotArea area) {
50
51
  }
51
52
 
53
+ @Override
54
+ public BiomeType getBiome(final PlotArea settings, final int x, final int y, final int z) {
55
+ return null;
56
+ }
57
+
52
58
  @Override
53
59
  public String getName() {
54
60
  return this.chunkGenerator.getClass().getName();
@@ -60,7 +66,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
60
66
  }
61
67
 
62
68
  @Override
63
- public void generateChunk(final ScopedQueueCoordinator result, PlotArea settings) {
69
+ public void generateChunk(final ZeroedDelegateScopedQueueCoordinator result, PlotArea settings, boolean biomes) {
64
70
  World world = BukkitUtil.getWorld(this.world);
65
71
  Location min = result.getMin();
66
72
  int chunkX = min.getX() >> 4;
Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java CHANGED
@@ -26,7 +26,7 @@ import com.plotsquared.core.location.UncheckedWorldLocation;
26
26
  import com.plotsquared.core.plot.PlotArea;
27
27
  import com.plotsquared.core.plot.world.SinglePlotArea;
28
28
  import com.plotsquared.core.queue.QueueCoordinator;
29
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
29
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
30
30
  import com.sk89q.worldedit.bukkit.BukkitWorld;
31
31
  import com.sk89q.worldedit.util.SideEffectSet;
32
32
  import org.bukkit.Chunk;
@@ -65,7 +65,7 @@ final class LegacyBlockStatePopulator extends BlockPopulator {
65
65
  queue.setChunkObject(source);
66
66
  Location min = UncheckedWorldLocation.at(world.getName(), chunkMinX, world.getMinHeight(), chunkMinZ);
67
67
  Location max = UncheckedWorldLocation.at(world.getName(), chunkMinX + 15, world.getMaxHeight(), chunkMinZ + 15);
68
- ScopedQueueCoordinator offsetChunkQueue = new ScopedQueueCoordinator(queue, min, max);
68
+ ZeroedDelegateScopedQueueCoordinator offsetChunkQueue = new ZeroedDelegateScopedQueueCoordinator(queue, min, max);
69
69
  this.plotGenerator.populateChunk(offsetChunkQueue, area);
70
70
  queue.enqueue();
71
71
  }
Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java CHANGED
@@ -61,11 +61,12 @@ import com.plotsquared.core.util.task.TaskTime;
61
61
  import com.sk89q.worldedit.WorldEdit;
62
62
  import com.sk89q.worldedit.bukkit.BukkitAdapter;
63
63
  import com.sk89q.worldedit.world.block.BlockType;
64
- import net.kyori.adventure.text.minimessage.Template;
64
+ import net.kyori.adventure.text.Component;
65
+ import net.kyori.adventure.text.minimessage.tag.Tag;
66
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
65
67
  import org.bukkit.Bukkit;
66
68
  import org.bukkit.GameMode;
67
69
  import org.bukkit.Material;
68
- import org.bukkit.Tag;
69
70
  import org.bukkit.block.Block;
70
71
  import org.bukkit.block.BlockFace;
71
72
  import org.bukkit.block.BlockState;
@@ -114,6 +115,10 @@ import java.util.UUID;
114
115
  import java.util.stream.Collectors;
115
116
  import java.util.stream.Stream;
116
117
 
118
+ import static org.bukkit.Tag.CORALS;
119
+ import static org.bukkit.Tag.CORAL_BLOCKS;
120
+ import static org.bukkit.Tag.WALL_CORALS;
121
+
117
122
  @SuppressWarnings("unused")
118
123
  public class BlockEventListener implements Listener {
119
124
 
@@ -276,13 +281,23 @@ public class BlockEventListener implements Listener {
276
281
  if (plot != null) {
277
282
  if (area.notifyIfOutsideBuildArea(pp, location.getY())) {
278
283
  event.setCancelled(true);
284
+ pp.sendMessage(
285
+ TranslatableCaption.of("height.height_limit"),
286
+ TagResolver.builder()
287
+ .tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
288
+ .tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
289
+ .build()
290
+ );
279
291
  return;
280
292
  }
281
293
  if (!plot.hasOwner()) {
282
294
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
283
295
  pp.sendMessage(
284
296
  TranslatableCaption.of("permission.no_permission_event"),
285
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
297
+ TagResolver.resolver(
298
+ "node",
299
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
300
+ )
286
301
  );
287
302
  event.setCancelled(true);
288
303
  return;
@@ -299,7 +314,10 @@ public class BlockEventListener implements Listener {
299
314
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
300
315
  pp.sendMessage(
301
316
  TranslatableCaption.of("permission.no_permission_event"),
302
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
317
+ TagResolver.resolver(
318
+ "node",
319
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
320
+ )
303
321
  );
304
322
  event.setCancelled(true);
305
323
  plot.debug(player.getName() + " could not place " + event.getBlock().getType()
@@ -326,7 +344,10 @@ public class BlockEventListener implements Listener {
326
344
  } else if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
327
345
  pp.sendMessage(
328
346
  TranslatableCaption.of("permission.no_permission_event"),
329
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
347
+ TagResolver.resolver(
348
+ "node",
349
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
350
+ )
330
351
  );
331
352
  event.setCancelled(true);
332
353
  }
@@ -348,13 +369,23 @@ public class BlockEventListener implements Listener {
348
369
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
349
370
  plotPlayer.sendMessage(
350
371
  TranslatableCaption.of("permission.no_permission_event"),
351
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL))
372
+ TagResolver.resolver(
373
+ "node",
374
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)
375
+ )
352
376
  );
353
377
  event.setCancelled(true);
354
378
  return;
355
379
  }
356
380
  } else if (area.notifyIfOutsideBuildArea(plotPlayer, location.getY())) {
357
381
  event.setCancelled(true);
382
+ plotPlayer.sendMessage(
383
+ TranslatableCaption.of("height.height_limit"),
384
+ TagResolver.builder()
385
+ .tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
386
+ .tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
387
+ .build()
388
+ );
358
389
  return;
359
390
  }
360
391
  if (!plot.hasOwner()) {
@@ -377,7 +408,10 @@ public class BlockEventListener implements Listener {
377
408
  }
378
409
  plotPlayer.sendMessage(
379
410
  TranslatableCaption.of("permission.no_permission_event"),
380
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
411
+ TagResolver.resolver(
412
+ "node",
413
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
414
+ )
381
415
  );
382
416
  event.setCancelled(true);
383
417
  } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@@ -403,7 +437,10 @@ public class BlockEventListener implements Listener {
403
437
  }
404
438
  pp.sendMessage(
405
439
  TranslatableCaption.of("permission.no_permission_event"),
406
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
440
+ TagResolver.resolver(
441
+ "node",
442
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
443
+ )
407
444
  );
408
445
  event.setCancelled(true);
409
446
  }
@@ -536,14 +573,14 @@ public class BlockEventListener implements Listener {
536
573
  event.setCancelled(true);
537
574
  return;
538
575
  }
539
- if (SNOW.contains(event.getNewState().getType())) {
576
+ if (org.bukkit.Tag.SNOW.isTagged(event.getNewState().getType())) {
540
577
  if (!plot.getFlag(SnowFormFlag.class)) {
541
578
  plot.debug("Snow could not form because snow-form = false");
542
579
  event.setCancelled(true);
543
580
  }
544
581
  return;
545
582
  }
546
- if (Tag.ICE.isTagged(event.getNewState().getType())) {
583
+ if (org.bukkit.Tag.ICE.isTagged(event.getNewState().getType())) {
547
584
  if (!plot.getFlag(IceFormFlag.class)) {
548
585
  plot.debug("Ice could not form because ice-form = false");
549
586
  event.setCancelled(true);
@@ -568,9 +605,9 @@ public class BlockEventListener implements Listener {
568
605
  return;
569
606
  }
570
607
  Class<? extends BooleanFlag<?>> flag;
571
- if (SNOW.contains(event.getNewState().getType())) {
608
+ if (org.bukkit.Tag.SNOW.isTagged(event.getNewState().getType())) {
572
609
  flag = SnowFormFlag.class;
573
- } else if (Tag.ICE.isTagged(event.getNewState().getType())) {
610
+ } else if (org.bukkit.Tag.ICE.isTagged(event.getNewState().getType())) {
574
611
  flag = IceFormFlag.class;
575
612
  } else {
576
613
  return;
@@ -676,14 +713,14 @@ public class BlockEventListener implements Listener {
676
713
  return;
677
714
  }
678
715
  Material blockType = block.getType();
679
- if (Tag.ICE.isTagged(blockType)) {
716
+ if (org.bukkit.Tag.ICE.isTagged(blockType)) {
680
717
  if (!plot.getFlag(IceMeltFlag.class)) {
681
718
  plot.debug("Ice could not melt because ice-melt = false");
682
719
  event.setCancelled(true);
683
720
  }
684
721
  return;
685
722
  }
686
- if (SNOW.contains(blockType)) {
723
+ if (org.bukkit.Tag.SNOW.isTagged(blockType)) {
687
724
  if (!plot.getFlag(SnowMeltFlag.class)) {
688
725
  plot.debug("Snow could not melt because snow-melt = false");
689
726
  event.setCancelled(true);
@@ -697,7 +734,7 @@ public class BlockEventListener implements Listener {
697
734
  }
698
735
  return;
699
736
  }
700
- if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType) || Tag.WALL_CORALS.isTagged(blockType)) {
737
+ if (CORAL_BLOCKS.isTagged(blockType) || CORALS.isTagged(blockType) || WALL_CORALS.isTagged(blockType)) {
701
738
  if (!plot.getFlag(CoralDryFlag.class)) {
702
739
  plot.debug("Coral could not dry because coral-dry = false");
703
740
  event.setCancelled(true);
@@ -722,7 +759,9 @@ public class BlockEventListener implements Listener {
722
759
  return;
723
760
  }
724
761
 
725
- if (block.getBlockData() instanceof Farmland farmland && event.getNewState().getBlockData() instanceof Farmland newFarmland) {
762
+ if (block.getBlockData() instanceof Farmland farmland && event
763
+ .getNewState()
764
+ .getBlockData() instanceof Farmland newFarmland) {
726
765
  int currentMoisture = farmland.getMoisture();
727
766
  int newMoisture = newFarmland.getMoisture();
728
767
 
@@ -785,7 +824,10 @@ public class BlockEventListener implements Listener {
785
824
  }
786
825
 
787
826
  if (toPlot != null) {
788
- if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(toPlot, toArea.getOwnedPlot(fromLocation))) {
827
+ if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(
828
+ toPlot,
829
+ toArea.getOwnedPlot(fromLocation)
830
+ )) {
789
831
  event.setCancelled(true);
790
832
  return;
791
833
  }
@@ -801,7 +843,10 @@ public class BlockEventListener implements Listener {
801
843
  toPlot.debug("Liquid could not flow because liquid-flow = disabled");
802
844
  event.setCancelled(true);
803
845
  }
804
- } else if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(null, toArea.getOwnedPlot(fromLocation))) {
846
+ } else if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(
847
+ null,
848
+ toArea.getOwnedPlot(fromLocation)
849
+ )) {
805
850
  event.setCancelled(true);
806
851
  } else if (event.getBlock().isLiquid()) {
807
852
  final org.bukkit.Location location = event.getBlock().getLocation();
@@ -1124,7 +1169,10 @@ public class BlockEventListener implements Listener {
1124
1169
  )) {
1125
1170
  pp.sendMessage(
1126
1171
  TranslatableCaption.of("permission.no_permission_event"),
1127
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1172
+ TagResolver.resolver(
1173
+ "node",
1174
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
1175
+ )
1128
1176
  );
1129
1177
  event.setCancelled(true);
1130
1178
  }
@@ -1134,7 +1182,10 @@ public class BlockEventListener implements Listener {
1134
1182
  )) {
1135
1183
  pp.sendMessage(
1136
1184
  TranslatableCaption.of("permission.no_permission_event"),
1137
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
1185
+ TagResolver.resolver(
1186
+ "node",
1187
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
1188
+ )
1138
1189
  );
1139
1190
  event.setCancelled(true);
1140
1191
  }
@@ -1142,7 +1193,10 @@ public class BlockEventListener implements Listener {
1142
1193
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
1143
1194
  pp.sendMessage(
1144
1195
  TranslatableCaption.of("permission.no_permission_event"),
1145
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
1196
+ TagResolver.resolver(
1197
+ "node",
1198
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
1199
+ )
1146
1200
  );
1147
1201
  event.setCancelled(true);
1148
1202
  }
@@ -1268,16 +1322,29 @@ public class BlockEventListener implements Listener {
1268
1322
  ) && !(Objects.equals(currentLocation.getPlot(), plot))) {
1269
1323
  pp.sendMessage(
1270
1324
  TranslatableCaption.of("permission.no_permission_event"),
1271
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1325
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1272
1326
  );
1273
1327
  event.setCancelled(true);
1274
1328
  break;
1275
1329
  }
1276
- if (area.notifyIfOutsideBuildArea(pp, currentLocation.getY())) {
1277
- event.setCancelled(true);
1278
- break;
1330
+ if (pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
1331
+ continue;
1332
+ }
1333
+ if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) {
1334
+ pp.sendMessage(
1335
+ TranslatableCaption.of("height.height_limit"),
1336
+ TagResolver.builder()
1337
+ .tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
1338
+ .tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
1339
+ .build()
1340
+ );
1341
+ if (area.notifyIfOutsideBuildArea(pp, currentLocation.getY())) {
1342
+ event.setCancelled(true);
1343
+ break;
1344
+ }
1279
1345
  }
1280
1346
  }
1347
+
1281
1348
  }
1282
1349
 
1283
1350
  }
Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java CHANGED
@@ -92,7 +92,11 @@ public class BlockEventListener117 implements Listener {
92
92
  }
93
93
 
94
94
  Plot plot = location.getOwnedPlot();
95
- if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) || plot != null && !plot.getFlag(
95
+ if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(
96
+ area,
97
+ MiscInteractFlag.class,
98
+ true
99
+ ) || plot != null && !plot.getFlag(
96
100
  MiscInteractFlag.class)) {
97
101
  if (plotPlayer != null) {
98
102
  if (plot != null) {
Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java CHANGED
@@ -234,7 +234,8 @@ public class ChunkListener implements Listener {
234
234
  Chunk chunk = event.getChunk();
235
235
  if (Settings.Chunk_Processor.AUTO_TRIM) {
236
236
  String world = chunk.getWorld().getName();
237
- if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(world)) {
237
+ if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(
238
+ world)) {
238
239
  if (unloadChunk(world, chunk, true)) {
239
240
  return;
240
241
  }
Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java CHANGED
@@ -145,54 +145,37 @@ public class EntityEventListener implements Listener {
145
145
  }
146
146
  CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
147
147
  switch (reason.toString()) {
148
- case "DISPENSE_EGG":
149
- case "EGG":
150
- case "OCELOT_BABY":
151
- case "SPAWNER_EGG":
148
+ case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
152
149
  if (!area.isSpawnEggs()) {
153
150
  event.setCancelled(true);
154
151
  return;
155
152
  }
156
- break;
157
- case "REINFORCEMENTS":
158
- case "NATURAL":
159
- case "MOUNT":
160
- case "PATROL":
161
- case "RAID":
162
- case "SHEARED":
163
- case "SILVERFISH_BLOCK":
164
- case "ENDER_PEARL":
165
- case "TRAP":
166
- case "VILLAGE_DEFENSE":
167
- case "VILLAGE_INVASION":
168
- case "BEEHIVE":
169
- case "CHUNK_GEN":
153
+ }
154
+ case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
155
+ "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
170
156
  if (!area.isMobSpawning()) {
171
157
  event.setCancelled(true);
172
158
  return;
173
159
  }
174
- break;
175
- case "BREEDING":
160
+ }
161
+ case "BREEDING" -> {
176
162
  if (!area.isSpawnBreeding()) {
177
163
  event.setCancelled(true);
178
164
  return;
179
165
  }
180
- break;
181
- case "BUILD_IRONGOLEM":
182
- case "BUILD_SNOWMAN":
183
- case "BUILD_WITHER":
184
- case "CUSTOM":
166
+ }
167
+ case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
185
168
  if (!area.isSpawnCustom() && entity.getType() != EntityType.ARMOR_STAND) {
186
169
  event.setCancelled(true);
187
170
  return;
188
171
  }
189
- break;
190
- case "SPAWNER":
172
+ }
173
+ case "SPAWNER" -> {
191
174
  if (!area.isMobSpawnerSpawning()) {
192
175
  event.setCancelled(true);
193
176
  return;
194
177
  }
195
- break;
178
+ }
196
179
  }
197
180
  Plot plot = area.getOwnedPlotAbs(location);
198
181
  if (plot == null) {
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java CHANGED
@@ -44,7 +44,9 @@ import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
44
44
  import com.plotsquared.core.plot.flag.types.BooleanFlag;
45
45
  import com.plotsquared.core.plot.world.PlotAreaManager;
46
46
  import com.plotsquared.core.util.PlotFlagUtil;
47
- import net.kyori.adventure.text.minimessage.Template;
47
+ import net.kyori.adventure.text.Component;
48
+ import net.kyori.adventure.text.minimessage.tag.Tag;
49
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
48
50
  import org.bukkit.Chunk;
49
51
  import org.bukkit.block.Block;
50
52
  import org.bukkit.block.TileState;
@@ -176,59 +178,41 @@ public class PaperListener implements Listener {
176
178
  }
177
179
  CreatureSpawnEvent.SpawnReason reason = event.getReason();
178
180
  switch (reason.toString()) {
179
- case "DISPENSE_EGG":
180
- case "EGG":
181
- case "OCELOT_BABY":
182
- case "SPAWNER_EGG":
181
+ case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
183
182
  if (!area.isSpawnEggs()) {
184
183
  event.setShouldAbortSpawn(true);
185
184
  event.setCancelled(true);
186
185
  return;
187
186
  }
188
- break;
189
- case "REINFORCEMENTS":
190
- case "NATURAL":
191
- case "MOUNT":
192
- case "PATROL":
193
- case "RAID":
194
- case "SHEARED":
195
- case "SILVERFISH_BLOCK":
196
- case "ENDER_PEARL":
197
- case "TRAP":
198
- case "VILLAGE_DEFENSE":
199
- case "VILLAGE_INVASION":
200
- case "BEEHIVE":
201
- case "CHUNK_GEN":
187
+ }
188
+ case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
202
189
  if (!area.isMobSpawning()) {
203
190
  event.setShouldAbortSpawn(true);
204
191
  event.setCancelled(true);
205
192
  return;
206
193
  }
207
- break;
208
- case "BREEDING":
194
+ }
195
+ case "BREEDING" -> {
209
196
  if (!area.isSpawnBreeding()) {
210
197
  event.setShouldAbortSpawn(true);
211
198
  event.setCancelled(true);
212
199
  return;
213
200
  }
214
- break;
215
- case "BUILD_IRONGOLEM":
216
- case "BUILD_SNOWMAN":
217
- case "BUILD_WITHER":
218
- case "CUSTOM":
201
+ }
202
+ case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
219
203
  if (!area.isSpawnCustom() && event.getType() != EntityType.ARMOR_STAND) {
220
204
  event.setShouldAbortSpawn(true);
221
205
  event.setCancelled(true);
222
206
  return;
223
207
  }
224
- break;
225
- case "SPAWNER":
208
+ }
209
+ case "SPAWNER" -> {
226
210
  if (!area.isMobSpawnerSpawning()) {
227
211
  event.setShouldAbortSpawn(true);
228
212
  event.setCancelled(true);
229
213
  return;
230
214
  }
231
- break;
215
+ }
232
216
  }
233
217
  Plot plot = location.getOwnedPlotAbs();
234
218
  if (plot == null) {
@@ -302,7 +286,7 @@ public class PaperListener implements Listener {
302
286
  final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
303
287
  plotPlayer.sendMessage(
304
288
  TranslatableCaption.of("errors.tile_entity_cap_reached"),
305
- Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
289
+ TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
306
290
  );
307
291
  event.setCancelled(true);
308
292
  event.setBuild(false);
@@ -339,7 +323,10 @@ public class PaperListener implements Listener {
339
323
  )) {
340
324
  pp.sendMessage(
341
325
  TranslatableCaption.of("permission.no_permission_event"),
342
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
326
+ TagResolver.resolver(
327
+ "node",
328
+ Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
329
+ )
343
330
  );
344
331
  entity.remove();
345
332
  event.setCancelled(true);
@@ -348,7 +335,10 @@ public class PaperListener implements Listener {
348
335
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
349
336
  pp.sendMessage(
350
337
  TranslatableCaption.of("permission.no_permission_event"),
351
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
338
+ TagResolver.resolver(
339
+ "node",
340
+ Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
341
+ )
352
342
  );
353
343
  entity.remove();
354
344
  event.setCancelled(true);
@@ -358,7 +348,10 @@ public class PaperListener implements Listener {
358
348
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
359
349
  pp.sendMessage(
360
350
  TranslatableCaption.of("permission.no_permission_event"),
361
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
351
+ TagResolver.resolver(
352
+ "node",
353
+ Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
354
+ )
362
355
  );
363
356
  entity.remove();
364
357
  event.setCancelled(true);
@@ -446,9 +439,11 @@ public class PaperListener implements Listener {
446
439
  }
447
440
  }
448
441
 
449
- private boolean getBooleanFlagValue(@NonNull FlagContainer container,
450
- @NonNull Class<? extends BooleanFlag<?>> flagClass,
451
- boolean defaultValue) {
442
+ private boolean getBooleanFlagValue(
443
+ @NonNull FlagContainer container,
444
+ @NonNull Class<? extends BooleanFlag<?>> flagClass,
445
+ boolean defaultValue
446
+ ) {
452
447
  BooleanFlag<?> flag = container.getFlag(flagClass);
453
448
  return flag == null ? defaultValue : flag.getValue();
454
449
  }
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener113.java DELETED
@@ -1,91 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.bukkit.listener;
20
-
21
- import com.google.inject.Inject;
22
- import com.plotsquared.bukkit.util.BukkitUtil;
23
- import com.plotsquared.core.configuration.Settings;
24
- import com.plotsquared.core.configuration.caption.TranslatableCaption;
25
- import com.plotsquared.core.location.Location;
26
- import com.plotsquared.core.player.PlotPlayer;
27
- import com.plotsquared.core.plot.PlotArea;
28
- import com.plotsquared.core.plot.world.PlotAreaManager;
29
- import net.kyori.adventure.text.minimessage.Template;
30
- import org.bukkit.block.Banner;
31
- import org.bukkit.block.Beacon;
32
- import org.bukkit.block.BlockState;
33
- import org.bukkit.block.CommandBlock;
34
- import org.bukkit.block.Comparator;
35
- import org.bukkit.block.Conduit;
36
- import org.bukkit.block.Container;
37
- import org.bukkit.block.CreatureSpawner;
38
- import org.bukkit.block.DaylightDetector;
39
- import org.bukkit.block.EnchantingTable;
40
- import org.bukkit.block.EndGateway;
41
- import org.bukkit.block.EnderChest;
42
- import org.bukkit.block.Jukebox;
43
- import org.bukkit.block.Sign;
44
- import org.bukkit.block.Skull;
45
- import org.bukkit.block.Structure;
46
- import org.bukkit.block.data.type.Bed;
47
- import org.bukkit.event.EventHandler;
48
- import org.bukkit.event.block.BlockPlaceEvent;
49
- import org.checkerframework.checker.nullness.qual.NonNull;
50
-
51
- /**
52
- * @deprecated P2 effectively no longer supports 1.13
53
- */
54
- @Deprecated(forRemoval = true, since = "6.10.4")
55
- public class PaperListener113 extends PaperListener {
56
-
57
- @Inject
58
- public PaperListener113(@NonNull PlotAreaManager plotAreaManager) {
59
- super(plotAreaManager);
60
- }
61
-
62
- @EventHandler
63
- public void onBlockPlace(BlockPlaceEvent event) {
64
- if (!Settings.Paper_Components.TILE_ENTITY_CHECK || !Settings.Enabled_Components.CHUNK_PROCESSOR) {
65
- return;
66
- }
67
- BlockState state = event.getBlock().getState(false);
68
- if (!(state instanceof Banner || state instanceof Beacon || state instanceof Bed || state instanceof CommandBlock
69
- || state instanceof Comparator || state instanceof Conduit || state instanceof Container || state instanceof CreatureSpawner
70
- || state instanceof DaylightDetector || state instanceof EnchantingTable || state instanceof EnderChest || state instanceof EndGateway
71
- || state instanceof Jukebox || state instanceof Sign || state instanceof Skull || state instanceof Structure)) {
72
- return;
73
- }
74
- final Location location = BukkitUtil.adapt(event.getBlock().getLocation());
75
- final PlotArea plotArea = location.getPlotArea();
76
- if (plotArea == null) {
77
- return;
78
- }
79
- final int tileEntityCount = event.getBlock().getChunk().getTileEntities(false).length;
80
- if (tileEntityCount >= Settings.Chunk_Processor.MAX_TILES) {
81
- final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
82
- plotPlayer.sendMessage(
83
- TranslatableCaption.of("errors.tile_entity_cap_reached"),
84
- Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
85
- );
86
- event.setCancelled(true);
87
- event.setBuild(false);
88
- }
89
- }
90
-
91
- }
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java CHANGED
@@ -77,12 +77,13 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
77
77
  import com.sk89q.worldedit.world.block.BlockType;
78
78
  import io.papermc.lib.PaperLib;
79
79
  import net.kyori.adventure.text.Component;
80
- import net.kyori.adventure.text.minimessage.Template;
80
+ import net.kyori.adventure.text.minimessage.MiniMessage;
81
+ import net.kyori.adventure.text.minimessage.tag.Tag;
82
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
83
+ import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
81
84
  import org.bukkit.Bukkit;
82
- import org.bukkit.ChatColor;
83
85
  import org.bukkit.FluidCollisionMode;
84
86
  import org.bukkit.Material;
85
- import org.bukkit.Tag;
86
87
  import org.bukkit.block.Block;
87
88
  import org.bukkit.block.BlockFace;
88
89
  import org.bukkit.block.BlockState;
@@ -272,8 +273,7 @@ public class PlayerEventListener implements Listener {
272
273
  Plot plot = plotPlayer.getCurrentPlot();
273
274
  // Check WorldEdit
274
275
  switch (parts[0]) {
275
- case "up":
276
- case "worldedit:up":
276
+ case "up", "worldedit:up" -> {
277
277
  if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !plotPlayer.hasPermission(
278
278
  Permission.PERMISSION_ADMIN_BUILD_OTHER,
279
279
  true
@@ -281,6 +281,7 @@ public class PlayerEventListener implements Listener {
281
281
  event.setCancelled(true);
282
282
  return;
283
283
  }
284
+ }
284
285
  }
285
286
  if (plot == null && !area.isRoadFlags()) {
286
287
  return;
@@ -398,11 +399,15 @@ public class PlayerEventListener implements Listener {
398
399
  && PremiumVerification.isPremium() && UpdateUtility.hasUpdate) {
399
400
  Caption boundary = TranslatableCaption.of("update.update_boundary");
400
401
  Caption updateNotification = TranslatableCaption.of("update.update_notification");
401
- Template internalVersion = Template.of("p2version", UpdateUtility.internalVersion.versionString());
402
- Template spigotVersion = Template.of("spigotversion", UpdateUtility.spigotVersion);
403
- Template downloadUrl = Template.of("downloadurl", "https://www.spigotmc.org/resources/77506/updates");
404
402
  pp.sendMessage(boundary);
405
- pp.sendMessage(updateNotification, internalVersion, spigotVersion, downloadUrl);
403
+ pp.sendMessage(
404
+ updateNotification,
405
+ TagResolver.builder()
406
+ .tag("p2version", Tag.inserting(Component.text(UpdateUtility.internalVersion.versionString())))
407
+ .tag("spigotversion", Tag.inserting(Component.text(UpdateUtility.spigotVersion)))
408
+ .tag("downloadurl", Tag.preProcessParsed("https://www.spigotmc.org/resources/77506/updates"))
409
+ .build()
410
+ );
406
411
  pp.sendMessage(boundary);
407
412
  }
408
413
  }
@@ -454,7 +459,7 @@ public class PlayerEventListener implements Listener {
454
459
  .equals(BukkitUtil.adaptComplete(to)))) {
455
460
  pp.sendMessage(
456
461
  TranslatableCaption.of("deny.no_enter"),
457
- Template.of("plot", plot.toString())
462
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
458
463
  );
459
464
  event.setCancelled(true);
460
465
  }
@@ -567,10 +572,14 @@ public class PlayerEventListener implements Listener {
567
572
  if (now == null) {
568
573
  try (final MetaDataAccess<Boolean> kickAccess =
569
574
  pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
570
- if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
575
+ if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
576
+ false)) {
571
577
  pp.sendMessage(
572
578
  TranslatableCaption.of("permission.no_permission_event"),
573
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
579
+ TagResolver.resolver(
580
+ "node",
581
+ Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
582
+ )
574
583
  );
575
584
  this.tmpTeleport = false;
576
585
  if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
@@ -588,7 +597,7 @@ public class PlayerEventListener implements Listener {
588
597
  } else if (!plotListener.plotEntry(pp, now) && this.tmpTeleport) {
589
598
  pp.sendMessage(
590
599
  TranslatableCaption.of("deny.no_enter"),
591
- Template.of("plot", now.toString())
600
+ TagResolver.resolver("plot", Tag.inserting(Component.text(now.toString())))
592
601
  );
593
602
  this.tmpTeleport = false;
594
603
  to.setX(from.getBlockX());
@@ -657,10 +666,14 @@ public class PlayerEventListener implements Listener {
657
666
  if (plot == null) {
658
667
  try (final MetaDataAccess<Boolean> kickAccess =
659
668
  pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
660
- if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
669
+ if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
670
+ false)) {
661
671
  pp.sendMessage(
662
672
  TranslatableCaption.of("permission.no_permission_event"),
663
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
673
+ TagResolver.resolver(
674
+ "node",
675
+ Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
676
+ )
664
677
  );
665
678
  this.tmpTeleport = false;
666
679
  if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
@@ -678,7 +691,7 @@ public class PlayerEventListener implements Listener {
678
691
  } else if (!plotListener.plotEntry(pp, plot) && this.tmpTeleport) {
679
692
  pp.sendMessage(
680
693
  TranslatableCaption.of("deny.no_enter"),
681
- Template.of("plot", plot.toString())
694
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
682
695
  );
683
696
  this.tmpTeleport = false;
684
697
  player.teleport(from);
@@ -762,46 +775,34 @@ public class PlayerEventListener implements Listener {
762
775
  PlotId id = plot.getId();
763
776
  String worldName = plot.getWorldName();
764
777
  Caption msg = TranslatableCaption.of("chat.plot_chat_format");
765
- Template msgTemplate;
766
- Template worldNameTemplate = Template.of("world", worldName);
767
- Template plotTemplate = Template.of("plot_id", id.toString());
768
- Template senderTemplate = Template.of("sender", sender);
769
- // If we do/don't want colour, we need to be careful about how to go about it, as players could attempt either <gold></gold> or &6 etc.
770
- // In both cases, we want to use a Component Template to ensure that the player cannot use any placeholders in their message on purpose
771
- // or accidentally, as component templates are done at the end. We also need to deserialize from legacy color codes to a Component if
772
- // allowing colour.
778
+ TagResolver.Builder builder = TagResolver.builder();
779
+ builder.tag("world", Tag.inserting(Component.text(worldName)));
780
+ builder.tag("plot_id", Tag.inserting(Component.text(id.toString())));
781
+ builder.tag("sender", Tag.inserting(Component.text(sender)));
773
782
  if (plotPlayer.hasPermission("plots.chat.color")) {
774
- msgTemplate = Template
775
- .of(
776
- "msg",
777
- BukkitUtil.LEGACY_COMPONENT_SERIALIZER.deserialize(ChatColor.translateAlternateColorCodes(
778
- '&',
779
- message
780
- ))
781
- );
783
+ builder.tag("msg", Tag.inserting(MiniMessage.miniMessage().deserialize(
784
+ message,
785
+ TagResolver.resolver(StandardTags.color(), StandardTags.gradient(),
786
+ StandardTags.rainbow(), StandardTags.decorations()
787
+ )
788
+ )));
782
789
  } else {
783
- msgTemplate = Template.of("msg", BukkitUtil.MINI_MESSAGE.deserialize(
784
- ChatColor.stripColor(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(Component.text(message)))));
790
+ builder.tag("msg", Tag.inserting(Component.text(message)));
785
791
  }
786
792
  for (PlotPlayer<?> receiver : plotRecipients) {
787
- receiver.sendMessage(msg, worldNameTemplate, msgTemplate, plotTemplate, senderTemplate);
793
+ receiver.sendMessage(msg, builder.build());
788
794
  }
789
795
  if (!spies.isEmpty()) {
790
796
  Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
791
- Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
792
- Template spysenderTemplate = Template.of("sender", sender);
793
- Template spymessageTemplate = Template.of("msg", Component.text(message));
794
797
  for (PlotPlayer<?> player : spies) {
795
- player.sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate, spymessageTemplate);
798
+ player.sendMessage(spymsg, builder.tag("message", Tag.inserting(Component.text(message))).build());
796
799
  }
797
800
  }
798
801
  if (Settings.Chat.LOG_PLOTCHAT_TO_CONSOLE) {
799
802
  Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
800
- Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
801
- Template spysenderTemplate = Template.of("sender", sender);
802
- Template spymessageTemplate = Template.of("msg", Component.text(message));
803
- ConsolePlayer.getConsole().sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate,
804
- spymessageTemplate
803
+ ConsolePlayer.getConsole().sendMessage(
804
+ spymsg,
805
+ builder.tag("message", Tag.inserting(Component.text(message))).build()
805
806
  );
806
807
  }
807
808
  }
@@ -945,7 +946,10 @@ public class PlayerEventListener implements Listener {
945
946
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
946
947
  pp.sendMessage(
947
948
  TranslatableCaption.of("permission.no_permission_event"),
948
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
949
+ TagResolver.resolver(
950
+ "node",
951
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
952
+ )
949
953
  );
950
954
  cancelled = true;
951
955
  }
@@ -953,7 +957,10 @@ public class PlayerEventListener implements Listener {
953
957
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
954
958
  pp.sendMessage(
955
959
  TranslatableCaption.of("permission.no_permission_event"),
956
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
960
+ TagResolver.resolver(
961
+ "node",
962
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
963
+ )
957
964
  );
958
965
  cancelled = true;
959
966
  }
@@ -963,7 +970,10 @@ public class PlayerEventListener implements Listener {
963
970
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
964
971
  pp.sendMessage(
965
972
  TranslatableCaption.of("permission.no_permission_event"),
966
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
973
+ TagResolver.resolver(
974
+ "node",
975
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
976
+ )
967
977
  );
968
978
  cancelled = true;
969
979
  }
@@ -1002,7 +1012,10 @@ public class PlayerEventListener implements Listener {
1002
1012
  )) {
1003
1013
  pp.sendMessage(
1004
1014
  TranslatableCaption.of("permission.no_permission_event"),
1005
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
1015
+ TagResolver.resolver(
1016
+ "node",
1017
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
1018
+ )
1006
1019
  );
1007
1020
  e.setCancelled(true);
1008
1021
  }
@@ -1018,7 +1031,10 @@ public class PlayerEventListener implements Listener {
1018
1031
  if (!pp.hasPermission("plots.admin.interact.unowned")) {
1019
1032
  pp.sendMessage(
1020
1033
  TranslatableCaption.of("permission.no_permission_event"),
1021
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
1034
+ TagResolver.resolver(
1035
+ "node",
1036
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
1037
+ )
1022
1038
  );
1023
1039
  e.setCancelled(true);
1024
1040
  }
@@ -1033,7 +1049,10 @@ public class PlayerEventListener implements Listener {
1033
1049
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
1034
1050
  pp.sendMessage(
1035
1051
  TranslatableCaption.of("permission.no_permission_event"),
1036
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
1052
+ TagResolver.resolver(
1053
+ "node",
1054
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
1055
+ )
1037
1056
  );
1038
1057
  e.setCancelled(true);
1039
1058
  plot.debug(pp.getName() + " could not interact with " + entity.getType()
@@ -1097,13 +1116,13 @@ public class PlayerEventListener implements Listener {
1097
1116
  Location location = BukkitUtil.adapt(block.getLocation());
1098
1117
  Action action = event.getAction();
1099
1118
  switch (action) {
1100
- case PHYSICAL: {
1119
+ case PHYSICAL -> {
1101
1120
  eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
1102
1121
  blocktype1 = BukkitAdapter.asBlockType(block.getType());
1103
- break;
1104
1122
  }
1123
+
1105
1124
  //todo rearrange the right click code. it is all over the place.
1106
- case RIGHT_CLICK_BLOCK: {
1125
+ case RIGHT_CLICK_BLOCK -> {
1107
1126
  Material blockType = block.getType();
1108
1127
  eventType = PlayerBlockEventType.INTERACT_BLOCK;
1109
1128
  blocktype1 = BukkitAdapter.asBlockType(block.getType());
@@ -1125,21 +1144,16 @@ public class PlayerEventListener implements Listener {
1125
1144
 
1126
1145
  // in the following, lb needs to have the material of the item in hand i.e. type
1127
1146
  switch (type.toString()) {
1128
- case "REDSTONE":
1129
- case "STRING":
1130
- case "PUMPKIN_SEEDS":
1131
- case "MELON_SEEDS":
1132
- case "COCOA_BEANS":
1133
- case "WHEAT_SEEDS":
1134
- case "BEETROOT_SEEDS":
1135
- case "SWEET_BERRIES":
1136
- case "GLOW_BERRIES":
1147
+ case "REDSTONE", "STRING", "PUMPKIN_SEEDS", "MELON_SEEDS", "COCOA_BEANS", "WHEAT_SEEDS", "BEETROOT_SEEDS",
1148
+ "SWEET_BERRIES", "GLOW_BERRIES" -> {
1137
1149
  return;
1138
- default:
1150
+ }
1151
+ default -> {
1139
1152
  //eventType = PlayerBlockEventType.PLACE_BLOCK;
1140
1153
  if (type.isBlock()) {
1141
1154
  return;
1142
1155
  }
1156
+ }
1143
1157
  }
1144
1158
  if (PaperLib.isPaper()) {
1145
1159
  if (MaterialTags.SPAWN_EGGS.isTagged(type) || Material.EGG.equals(type)) {
@@ -1160,7 +1174,7 @@ public class PlayerEventListener implements Listener {
1160
1174
  location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation());
1161
1175
  eventType = PlayerBlockEventType.PLACE_MISC;
1162
1176
  }
1163
- if (Tag.ITEMS_BOATS.isTagged(type) || MINECARTS.contains(type)) {
1177
+ if (org.bukkit.Tag.ITEMS_BOATS.isTagged(type) || MINECARTS.contains(type)) {
1164
1178
  eventType = PlayerBlockEventType.PLACE_VEHICLE;
1165
1179
  break;
1166
1180
  }
@@ -1172,9 +1186,8 @@ public class PlayerEventListener implements Listener {
1172
1186
  eventType = PlayerBlockEventType.READ;
1173
1187
  break;
1174
1188
  }
1175
- break;
1176
1189
  }
1177
- case LEFT_CLICK_BLOCK: {
1190
+ case LEFT_CLICK_BLOCK -> {
1178
1191
  Material blockType = block.getType();
1179
1192
 
1180
1193
  // todo: when the code above is rearranged, it would be great to beautify this as well.
@@ -1185,10 +1198,10 @@ public class PlayerEventListener implements Listener {
1185
1198
 
1186
1199
  eventType = PlayerBlockEventType.INTERACT_BLOCK;
1187
1200
  blocktype1 = BukkitAdapter.asBlockType(block.getType());
1188
- break;
1189
1201
  }
1190
- default:
1202
+ default -> {
1191
1203
  return;
1204
+ }
1192
1205
  }
1193
1206
  if (this.worldEdit != null && pp.getAttribute("worldedit")) {
1194
1207
  if (event.getMaterial() == Material.getMaterial(this.worldEdit.getConfiguration().wandItem)) {
@@ -1260,7 +1273,7 @@ public class PlayerEventListener implements Listener {
1260
1273
  }
1261
1274
  pp.sendMessage(
1262
1275
  TranslatableCaption.of("permission.no_permission_event"),
1263
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1276
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1264
1277
  );
1265
1278
  event.setCancelled(true);
1266
1279
  } else if (!plot.hasOwner()) {
@@ -1269,7 +1282,10 @@ public class PlayerEventListener implements Listener {
1269
1282
  }
1270
1283
  pp.sendMessage(
1271
1284
  TranslatableCaption.of("permission.no_permission_event"),
1272
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
1285
+ TagResolver.resolver(
1286
+ "node",
1287
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
1288
+ )
1273
1289
  );
1274
1290
  event.setCancelled(true);
1275
1291
  } else if (!plot.isAdded(pp.getUUID())) {
@@ -1278,7 +1294,10 @@ public class PlayerEventListener implements Listener {
1278
1294
  }
1279
1295
  pp.sendMessage(
1280
1296
  TranslatableCaption.of("permission.no_permission_event"),
1281
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
1297
+ TagResolver.resolver(
1298
+ "node",
1299
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
1300
+ )
1282
1301
  );
1283
1302
  event.setCancelled(true);
1284
1303
  } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@@ -1325,7 +1344,7 @@ public class PlayerEventListener implements Listener {
1325
1344
  }
1326
1345
  plotPlayer.sendMessage(
1327
1346
  TranslatableCaption.of("permission.no_permission_event"),
1328
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1347
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1329
1348
  );
1330
1349
  event.setCancelled(true);
1331
1350
  } else if (!plot.hasOwner()) {
@@ -1334,7 +1353,10 @@ public class PlayerEventListener implements Listener {
1334
1353
  }
1335
1354
  plotPlayer.sendMessage(
1336
1355
  TranslatableCaption.of("permission.no_permission_event"),
1337
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
1356
+ TagResolver.resolver(
1357
+ "node",
1358
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
1359
+ )
1338
1360
  );
1339
1361
  event.setCancelled(true);
1340
1362
  } else if (!plot.isAdded(plotPlayer.getUUID())) {
@@ -1343,7 +1365,10 @@ public class PlayerEventListener implements Listener {
1343
1365
  }
1344
1366
  plotPlayer.sendMessage(
1345
1367
  TranslatableCaption.of("permission.no_permission_event"),
1346
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
1368
+ TagResolver.resolver(
1369
+ "node",
1370
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
1371
+ )
1347
1372
  );
1348
1373
  event.setCancelled(true);
1349
1374
  } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@@ -1375,7 +1400,10 @@ public class PlayerEventListener implements Listener {
1375
1400
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
1376
1401
  pp.sendMessage(
1377
1402
  TranslatableCaption.of("permission.no_permission_event"),
1378
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
1403
+ TagResolver.resolver(
1404
+ "node",
1405
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
1406
+ )
1379
1407
  );
1380
1408
  event.setCancelled(true);
1381
1409
  }
@@ -1384,7 +1412,10 @@ public class PlayerEventListener implements Listener {
1384
1412
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
1385
1413
  pp.sendMessage(
1386
1414
  TranslatableCaption.of("permission.no_permission_event"),
1387
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
1415
+ TagResolver.resolver(
1416
+ "node",
1417
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
1418
+ )
1388
1419
  );
1389
1420
  event.setCancelled(true);
1390
1421
  }
@@ -1395,7 +1426,10 @@ public class PlayerEventListener implements Listener {
1395
1426
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
1396
1427
  pp.sendMessage(
1397
1428
  TranslatableCaption.of("permission.no_permission_event"),
1398
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
1429
+ TagResolver.resolver(
1430
+ "node",
1431
+ Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
1432
+ )
1399
1433
  );
1400
1434
  event.setCancelled(true);
1401
1435
  }
@@ -1424,7 +1458,10 @@ public class PlayerEventListener implements Listener {
1424
1458
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_ROAD)) {
1425
1459
  pp.sendMessage(
1426
1460
  TranslatableCaption.of("permission.no_permission_event"),
1427
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
1461
+ TagResolver.resolver(
1462
+ "node",
1463
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
1464
+ )
1428
1465
  );
1429
1466
  event.setCancelled(true);
1430
1467
  }
@@ -1432,7 +1469,10 @@ public class PlayerEventListener implements Listener {
1432
1469
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
1433
1470
  pp.sendMessage(
1434
1471
  TranslatableCaption.of("permission.no_permission_event"),
1435
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
1472
+ TagResolver.resolver(
1473
+ "node",
1474
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
1475
+ )
1436
1476
  );
1437
1477
  event.setCancelled(true);
1438
1478
  }
@@ -1443,7 +1483,10 @@ public class PlayerEventListener implements Listener {
1443
1483
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
1444
1484
  pp.sendMessage(
1445
1485
  TranslatableCaption.of("permission.no_permission_event"),
1446
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
1486
+ TagResolver.resolver(
1487
+ "node",
1488
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
1489
+ )
1447
1490
  );
1448
1491
  event.setCancelled(true);
1449
1492
  plot.debug(p.getName()
@@ -1464,7 +1507,10 @@ public class PlayerEventListener implements Listener {
1464
1507
  if (!player.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
1465
1508
  player.sendMessage(
1466
1509
  TranslatableCaption.of("permission.no_permission_event"),
1467
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
1510
+ TagResolver.resolver(
1511
+ "node",
1512
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
1513
+ )
1468
1514
  );
1469
1515
  event.setCancelled(true);
1470
1516
  }
@@ -1473,7 +1519,10 @@ public class PlayerEventListener implements Listener {
1473
1519
  if (!player.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
1474
1520
  player.sendMessage(
1475
1521
  TranslatableCaption.of("permission.no_permission_event"),
1476
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
1522
+ TagResolver.resolver(
1523
+ "node",
1524
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
1525
+ )
1477
1526
  );
1478
1527
  event.setCancelled(true);
1479
1528
  plot.debug(player.getName()
@@ -1505,7 +1554,10 @@ public class PlayerEventListener implements Listener {
1505
1554
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
1506
1555
  pp.sendMessage(
1507
1556
  TranslatableCaption.of("permission.no_permission_event"),
1508
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
1557
+ TagResolver.resolver(
1558
+ "node",
1559
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
1560
+ )
1509
1561
  );
1510
1562
  event.setCancelled(true);
1511
1563
  }
@@ -1513,7 +1565,10 @@ public class PlayerEventListener implements Listener {
1513
1565
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
1514
1566
  pp.sendMessage(
1515
1567
  TranslatableCaption.of("permission.no_permission_event"),
1516
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
1568
+ TagResolver.resolver(
1569
+ "node",
1570
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
1571
+ )
1517
1572
  );
1518
1573
  event.setCancelled(true);
1519
1574
  }
@@ -1571,7 +1626,10 @@ public class PlayerEventListener implements Listener {
1571
1626
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
1572
1627
  pp.sendMessage(
1573
1628
  TranslatableCaption.of("permission.no_permission_event"),
1574
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
1629
+ TagResolver.resolver(
1630
+ "node",
1631
+ Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
1632
+ )
1575
1633
  );
1576
1634
  event.setCancelled(true);
1577
1635
  }
@@ -1595,7 +1653,10 @@ public class PlayerEventListener implements Listener {
1595
1653
  )) {
1596
1654
  pp.sendMessage(
1597
1655
  TranslatableCaption.of("permission.no_permission_event"),
1598
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD))
1656
+ TagResolver.resolver(
1657
+ "node",
1658
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)
1659
+ )
1599
1660
  );
1600
1661
  event.setCancelled(true);
1601
1662
  }
@@ -1604,7 +1665,10 @@ public class PlayerEventListener implements Listener {
1604
1665
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) {
1605
1666
  pp.sendMessage(
1606
1667
  TranslatableCaption.of("permission.no_permission_event"),
1607
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED))
1668
+ TagResolver.resolver(
1669
+ "node",
1670
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)
1671
+ )
1608
1672
  );
1609
1673
  event.setCancelled(true);
1610
1674
  return;
@@ -1618,7 +1682,10 @@ public class PlayerEventListener implements Listener {
1618
1682
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) {
1619
1683
  pp.sendMessage(
1620
1684
  TranslatableCaption.of("permission.no_permission_event"),
1621
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER))
1685
+ TagResolver.resolver(
1686
+ "node",
1687
+ Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)
1688
+ )
1622
1689
  );
1623
1690
  event.setCancelled(true);
1624
1691
  plot.debug(pp.getName()
Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java CHANGED
@@ -31,7 +31,8 @@ import com.plotsquared.core.plot.PlotHandler;
31
31
  import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
32
32
  import com.plotsquared.core.plot.world.PlotAreaManager;
33
33
  import com.plotsquared.core.util.PlotFlagUtil;
34
- import net.kyori.adventure.text.minimessage.Template;
34
+ import net.kyori.adventure.text.minimessage.tag.Tag;
35
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
35
36
  import org.bukkit.entity.Entity;
36
37
  import org.bukkit.entity.LivingEntity;
37
38
  import org.bukkit.entity.Player;
@@ -110,7 +111,10 @@ public class ProjectileEventListener implements Listener {
110
111
  )) {
111
112
  pp.sendMessage(
112
113
  TranslatableCaption.of("permission.no_permission_event"),
113
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
114
+ TagResolver.resolver(
115
+ "node",
116
+ Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
117
+ )
114
118
  );
115
119
  entity.remove();
116
120
  event.setCancelled(true);
@@ -119,7 +123,10 @@ public class ProjectileEventListener implements Listener {
119
123
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
120
124
  pp.sendMessage(
121
125
  TranslatableCaption.of("permission.no_permission_event"),
122
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
126
+ TagResolver.resolver(
127
+ "node",
128
+ Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
129
+ )
123
130
  );
124
131
  entity.remove();
125
132
  event.setCancelled(true);
@@ -129,7 +136,10 @@ public class ProjectileEventListener implements Listener {
129
136
  if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
130
137
  pp.sendMessage(
131
138
  TranslatableCaption.of("permission.no_permission_event"),
132
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
139
+ TagResolver.resolver(
140
+ "node",
141
+ Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
142
+ )
133
143
  );
134
144
  entity.remove();
135
145
  event.setCancelled(true);
Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java DELETED
@@ -1,63 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.bukkit.managers;
20
-
21
- /*
22
- import com.google.inject.Singleton;
23
- import org.bukkit.World;
24
- import org.checkerframework.checker.nullness.qual.NonNull;
25
- import org.checkerframework.checker.nullness.qual.Nullable;
26
- import se.hyperver.hyperverse.Hyperverse;
27
- import se.hyperver.hyperverse.world.WorldConfiguration;
28
- import se.hyperver.hyperverse.world.WorldConfigurationBuilder;
29
- import se.hyperver.hyperverse.world.WorldFeatures;
30
- import se.hyperver.hyperverse.world.WorldType;
31
-
32
- Hyperverse implementation is currently put on ice until Hyperverse is released on a stable line and deployed to the central
33
- repository.
34
-
35
- @Singleton
36
- public class HyperverseWorldManager extends BukkitWorldManager {
37
-
38
- @Override
39
- public @Nullable World handleWorldCreation(@NonNull String worldName, @Nullable String generator) {
40
- // First let Bukkit register the world
41
- this.setGenerator(worldName, generator);
42
- // Create the world
43
- final WorldConfigurationBuilder worldConfigurationBuilder = WorldConfiguration.builder()
44
- .setName(worldName).setType(WorldType.OVER_WORLD);
45
- if (generator != null) {
46
- worldConfigurationBuilder.setGenerator(generator).setWorldFeatures(WorldFeatures.FLATLAND);
47
- }
48
- try {
49
- return Hyperverse.getApi().createWorld(worldConfigurationBuilder.createWorldConfiguration())
50
- .getBukkitWorld();
51
- } catch (final Exception e) {
52
- e.printStackTrace();
53
- }
54
- return null;
55
- }
56
-
57
- @Override
58
- public String getName() {
59
- return "bukkit-hyperverse";
60
- }
61
-
62
- }
63
- */
Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java CHANGED
@@ -52,7 +52,7 @@ public class MVdWPlaceholders {
52
52
 
53
53
  @Subscribe
54
54
  public void onNewPlaceholder(final PlaceholderRegistry.@NonNull PlaceholderAddedEvent event) {
55
- this.addPlaceholder(event.getPlaceholder());
55
+ this.addPlaceholder(event.placeholder());
56
56
  }
57
57
 
58
58
  private void addPlaceholder(final @NonNull Placeholder placeholder) {
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java CHANGED
@@ -43,7 +43,7 @@ public class BukkitOfflinePlayer implements OfflinePlotPlayer {
43
43
  */
44
44
  public BukkitOfflinePlayer(
45
45
  final @NonNull OfflinePlayer player, final @NonNull
46
- PermissionHandler permissionHandler
46
+ PermissionHandler permissionHandler
47
47
  ) {
48
48
  this.player = player;
49
49
  this.permissionProfile = permissionHandler.getPermissionProfile(this)
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java CHANGED
@@ -71,31 +71,11 @@ public class BukkitPlayer extends PlotPlayer<Player> {
71
71
  * @param eventDispatcher EventDispatcher instance
72
72
  * @param player Bukkit player instance
73
73
  * @param permissionHandler PermissionHandler instance
74
- *
75
- * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
76
- * This method will be made private in a future release.
77
- */
78
- @Deprecated(forRemoval = true, since = "6.10.9")
79
- public BukkitPlayer(
80
- final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher,
81
- final @NonNull Player player, final @NonNull PermissionHandler permissionHandler
82
- ) {
83
- this(plotAreaManager, eventDispatcher, player, false, permissionHandler);
84
- }
85
-
86
- /**
87
- * @param plotAreaManager PlotAreaManager instance
88
- * @param eventDispatcher EventDispatcher instance
89
- * @param player Bukkit player instance
90
- * @param permissionHandler PermissionHandler instance
91
- *
92
- * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
93
- * This method will be made private in a future release.
94
74
  */
95
- @Deprecated(forRemoval = true, since = "6.10.9")
96
- public BukkitPlayer(
97
- final @NonNull PlotAreaManager plotAreaManager, final @NonNull
98
- EventDispatcher eventDispatcher, final @NonNull Player player,
75
+ BukkitPlayer(
76
+ final @NonNull PlotAreaManager plotAreaManager,
77
+ final @NonNull EventDispatcher eventDispatcher,
78
+ final @NonNull Player player,
99
79
  final boolean realPlayer,
100
80
  final @NonNull PermissionHandler permissionHandler
101
81
  ) {
@@ -196,6 +176,10 @@ public class BukkitPlayer extends PlotPlayer<Player> {
196
176
  final Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
197
177
  if (!effective.isEmpty()) {
198
178
  for (PermissionAttachmentInfo attach : effective) {
179
+ // Ignore all "false" permissions
180
+ if (!attach.getValue()) {
181
+ continue;
182
+ }
199
183
  String permStr = attach.getPermission();
200
184
  if (permStr.startsWith(stubPlus)) {
201
185
  hasAny = true;
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java CHANGED
@@ -54,7 +54,6 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
54
54
 
55
55
  @NonNull
56
56
  @Override
57
- @SuppressWarnings("deprecation")
58
57
  public BukkitPlayer getPlayer(final @NonNull Player object) {
59
58
  if (object.getUniqueId().version() == 2) { // not a real player
60
59
  return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler);
@@ -66,13 +65,12 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
66
65
  }
67
66
 
68
67
  @Override
69
- @SuppressWarnings("deprecation")
70
68
  public @NonNull BukkitPlayer createPlayer(final @NonNull UUID uuid) {
71
69
  final Player player = Bukkit.getPlayer(uuid);
72
70
  if (player == null || !player.isOnline()) {
73
71
  throw new NoSuchPlayerException(uuid);
74
72
  }
75
- return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, player, this.permissionHandler);
73
+ return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, player, false, this.permissionHandler);
76
74
  }
77
75
 
78
76
  @Nullable
Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java CHANGED
@@ -270,7 +270,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
270
270
  if (getChunkObject() instanceof Chunk chunkObject) {
271
271
  existing = chunkObject.getBlock(x & 15, y, z & 15);
272
272
  } else {
273
- existing = getBukkitWorld().getBlockAt(x, y, z);
273
+ existing = getBukkitWorld().getBlockAt(x, y, z);
274
274
  }
275
275
  final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData());
276
276
  if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) {
Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java CHANGED
@@ -24,7 +24,7 @@ import com.plotsquared.bukkit.util.BukkitBlockUtil;
24
24
  import com.plotsquared.bukkit.util.BukkitUtil;
25
25
  import com.plotsquared.core.location.ChunkWrapper;
26
26
  import com.plotsquared.core.location.Location;
27
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
27
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
28
28
  import com.plotsquared.core.util.ChunkUtil;
29
29
  import com.plotsquared.core.util.PatternUtil;
30
30
  import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -44,8 +44,11 @@ import org.checkerframework.checker.nullness.qual.Nullable;
44
44
 
45
45
  import java.util.Arrays;
46
46
 
47
+ /**
48
+ * Internal use only. Subject to changes at any time.
49
+ */
47
50
  @DoNotUse
48
- public class GenChunk extends ScopedQueueCoordinator {
51
+ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
49
52
 
50
53
  public final Biome[] biomes;
51
54
  public BlockState[][] result;
@@ -59,7 +62,6 @@ public class GenChunk extends ScopedQueueCoordinator {
59
62
  /**
60
63
  * @param minY minimum world Y, inclusive
61
64
  * @param maxY maximum world Y, inclusive
62
- *
63
65
  * @since 6.6.0
64
66
  */
65
67
  public GenChunk(int minY, int maxY) {
@@ -107,9 +109,9 @@ public class GenChunk extends ScopedQueueCoordinator {
107
109
  */
108
110
  public void setChunk(@NonNull ChunkWrapper wrap) {
109
111
  chunk = null;
110
- world = wrap.world;
111
- chunkX = wrap.x;
112
- chunkZ = wrap.z;
112
+ world = wrap.world();
113
+ chunkX = wrap.x();
114
+ chunkZ = wrap.z();
113
115
  }
114
116
 
115
117
  @Override
Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java CHANGED
@@ -18,6 +18,8 @@
18
18
  */
19
19
  package com.plotsquared.bukkit.schematic;
20
20
 
21
+ import com.destroystokyo.paper.profile.PlayerProfile;
22
+ import com.destroystokyo.paper.profile.ProfileProperty;
21
23
  import com.plotsquared.bukkit.util.BukkitUtil;
22
24
  import com.sk89q.jnbt.ByteTag;
23
25
  import com.sk89q.jnbt.CompoundTag;
@@ -28,16 +30,22 @@ import com.sk89q.jnbt.Tag;
28
30
  import com.sk89q.worldedit.blocks.BaseItemStack;
29
31
  import com.sk89q.worldedit.bukkit.BukkitAdapter;
30
32
  import com.sk89q.worldedit.world.item.ItemType;
33
+ import io.papermc.lib.PaperLib;
34
+ import org.apache.logging.log4j.LogManager;
35
+ import org.apache.logging.log4j.Logger;
31
36
  import org.bukkit.Bukkit;
32
37
  import org.bukkit.ChatColor;
38
+ import org.bukkit.DyeColor;
33
39
  import org.bukkit.World;
40
+ import org.bukkit.block.Banner;
34
41
  import org.bukkit.block.Block;
35
42
  import org.bukkit.block.Container;
36
43
  import org.bukkit.block.Sign;
37
44
  import org.bukkit.block.Skull;
45
+ import org.bukkit.block.banner.Pattern;
46
+ import org.bukkit.block.banner.PatternType;
38
47
  import org.bukkit.enchantments.Enchantment;
39
48
  import org.bukkit.inventory.Inventory;
40
- import org.bukkit.inventory.InventoryHolder;
41
49
  import org.bukkit.inventory.ItemStack;
42
50
  import org.checkerframework.checker.nullness.qual.NonNull;
43
51
 
@@ -46,20 +54,15 @@ import java.util.HashMap;
46
54
  import java.util.List;
47
55
  import java.util.Map;
48
56
  import java.util.Map.Entry;
57
+ import java.util.Objects;
58
+ import java.util.UUID;
49
59
 
50
60
  public class StateWrapper {
51
61
 
52
- public org.bukkit.block.BlockState state = null;
53
- public CompoundTag tag = null;
62
+ public CompoundTag tag;
54
63
 
55
- /**
56
- * @deprecated in favour of using WE methods for obtaining NBT, specifically by obtaining a
57
- * {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
58
- */
59
- @Deprecated(forRemoval = true, since = "6.9.0")
60
- public StateWrapper(org.bukkit.block.BlockState state) {
61
- this.state = state;
62
- }
64
+ private boolean paperErrorTextureSent = false;
65
+ private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
63
66
 
64
67
  public StateWrapper(CompoundTag tag) {
65
68
  this.tag = tag;
@@ -237,15 +240,64 @@ public class StateWrapper {
237
240
  return true;
238
241
  }
239
242
  String player = skullOwner.getString("Name");
240
- if (player == null || player.isEmpty()) {
243
+
244
+ if (player != null && !player.isEmpty()) {
245
+ try {
246
+ skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
247
+ skull.update(true);
248
+ } catch (Exception e) {
249
+ e.printStackTrace();
250
+ }
251
+ return true;
252
+ }
253
+
254
+ final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
255
+ if (properties == null) {
256
+ return false;
257
+ }
258
+ final ListTag textures = properties.getListTag("textures");
259
+ if (textures.getValue().isEmpty()) {
260
+ return false;
261
+ }
262
+ final CompoundTag textureCompound = (CompoundTag) textures.getValue().get(0);
263
+ if (textureCompound == null) {
264
+ return false;
265
+ }
266
+ String textureValue = textureCompound.getString("Value");
267
+ if (textureValue == null) {
268
+ return false;
269
+ }
270
+ if (!PaperLib.isPaper()) {
271
+ if (!paperErrorTextureSent) {
272
+ paperErrorTextureSent = true;
273
+ LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
274
+ }
241
275
  return false;
242
276
  }
243
- try {
244
- skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
245
- skull.update(true);
246
- } catch (Exception e) {
247
- e.printStackTrace();
277
+ final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
278
+ profile.setProperty(new ProfileProperty("textures", textureValue));
279
+ skull.setPlayerProfile(profile);
280
+ skull.update(true);
281
+ return true;
282
+
283
+ }
284
+ return false;
285
+ }
286
+ case "banner" -> {
287
+ if (state instanceof Banner banner) {
288
+ List<Tag> patterns = this.tag.getListTag("Patterns").getValue();
289
+ if (patterns == null || patterns.isEmpty()) {
290
+ return false;
248
291
  }
292
+ banner.setPatterns(patterns.stream().map(t -> (CompoundTag) t).map(compoundTag -> {
293
+ DyeColor color = DyeColor.getByWoolData((byte) compoundTag.getInt("Color"));
294
+ PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
295
+ if (color == null || patternType == null) {
296
+ return null;
297
+ }
298
+ return new Pattern(color, patternType);
299
+ }).filter(Objects::nonNull).toList());
300
+ banner.update(true);
249
301
  return true;
250
302
  }
251
303
  return false;
@@ -254,26 +306,6 @@ public class StateWrapper {
254
306
  return false;
255
307
  }
256
308
 
257
- /**
258
- * Get a CompoundTag of the contents of a block's inventory (chest, furnace, etc.).
259
- *
260
- * @deprecated in favour of using WorldEdit methods for obtaining NBT, specifically by obtaining a
261
- * {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
262
- */
263
- @Deprecated(forRemoval = true, since = "6.9.0")
264
- public CompoundTag getTag() {
265
- if (this.tag != null) {
266
- return this.tag;
267
- }
268
- if (this.state instanceof InventoryHolder inv) {
269
- ItemStack[] contents = inv.getInventory().getContents();
270
- Map<String, Tag> values = new HashMap<>();
271
- values.put("Items", new ListTag(CompoundTag.class, serializeInventory(contents)));
272
- return new CompoundTag(values);
273
- }
274
- return null;
275
- }
276
-
277
309
  public String getId() {
278
310
  String tileid = this.tag.getString("id").toLowerCase();
279
311
  if (tileid.startsWith("minecraft:")) {
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java CHANGED
@@ -42,7 +42,9 @@ import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
42
42
  import com.plotsquared.core.util.EntityUtil;
43
43
  import com.plotsquared.core.util.entity.EntityCategories;
44
44
  import com.sk89q.worldedit.bukkit.BukkitAdapter;
45
- import net.kyori.adventure.text.minimessage.Template;
45
+ import net.kyori.adventure.text.Component;
46
+ import net.kyori.adventure.text.minimessage.tag.Tag;
47
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
46
48
  import org.bukkit.entity.Arrow;
47
49
  import org.bukkit.entity.Creature;
48
50
  import org.bukkit.entity.Entity;
@@ -179,7 +181,10 @@ public class BukkitEntityUtil {
179
181
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
180
182
  plotPlayer.sendMessage(
181
183
  TranslatableCaption.of("permission.no_permission_event"),
182
- Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
184
+ TagResolver.resolver(
185
+ "node",
186
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
187
+ )
183
188
  );
184
189
  return false;
185
190
  }
@@ -191,7 +196,10 @@ public class BukkitEntityUtil {
191
196
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
192
197
  plotPlayer.sendMessage(
193
198
  TranslatableCaption.of("permission.no_permission_event"),
194
- Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
199
+ TagResolver.resolver(
200
+ "node",
201
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
202
+ )
195
203
  );
196
204
  if (plot != null) {
197
205
  plot.debug(player.getName()
@@ -212,7 +220,10 @@ public class BukkitEntityUtil {
212
220
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
213
221
  plotPlayer.sendMessage(
214
222
  TranslatableCaption.of("permission.no_permission_event"),
215
- Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
223
+ TagResolver.resolver(
224
+ "node",
225
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
226
+ )
216
227
  );
217
228
  if (plot != null) {
218
229
  plot.debug(player.getName() + " could not attack " + entityType
@@ -233,7 +244,10 @@ public class BukkitEntityUtil {
233
244
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
234
245
  plotPlayer.sendMessage(
235
246
  TranslatableCaption.of("permission.no_permission_event"),
236
- Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
247
+ TagResolver.resolver(
248
+ "node",
249
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
250
+ )
237
251
  );
238
252
  if (plot != null) {
239
253
  plot.debug(player.getName() + " could not attack " + entityType
@@ -246,7 +260,10 @@ public class BukkitEntityUtil {
246
260
  if (!plot.getFlag(PvpFlag.class) && !plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
247
261
  plotPlayer.sendMessage(
248
262
  TranslatableCaption.of("permission.no_permission_event"),
249
- Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
263
+ TagResolver.resolver(
264
+ "node",
265
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
266
+ )
250
267
  );
251
268
  plot.debug(player.getName() + " could not attack " + entityType
252
269
  + " because pve = false");
@@ -260,7 +277,10 @@ public class BukkitEntityUtil {
260
277
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
261
278
  plotPlayer.sendMessage(
262
279
  TranslatableCaption.of("permission.no_permission_event"),
263
- Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
280
+ TagResolver.resolver(
281
+ "node",
282
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
283
+ )
264
284
  );
265
285
  return false;
266
286
  }
@@ -277,7 +297,10 @@ public class BukkitEntityUtil {
277
297
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
278
298
  plotPlayer.sendMessage(
279
299
  TranslatableCaption.of("permission.no_permission_event"),
280
- Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
300
+ TagResolver.resolver(
301
+ "node",
302
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
303
+ )
281
304
  );
282
305
  if (plot != null) {
283
306
  plot.debug(player.getName() + " could not attack " + entityType
@@ -299,7 +322,10 @@ public class BukkitEntityUtil {
299
322
  if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
300
323
  plotPlayer.sendMessage(
301
324
  TranslatableCaption.of("permission.no_permission_event"),
302
- Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
325
+ TagResolver.resolver(
326
+ "node",
327
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
328
+ )
303
329
  );
304
330
  if (plot != null) {
305
331
  plot.debug(player.getName() + " could not attack " + entityType
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java CHANGED
@@ -56,7 +56,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
56
56
  ItemMeta meta = null;
57
57
  if (item.getName() != null) {
58
58
  meta = stack.getItemMeta();
59
- Component nameComponent = BukkitUtil.MINI_MESSAGE.parse(item.getName());
59
+ Component nameComponent = BukkitUtil.MINI_MESSAGE.deserialize(item.getName());
60
60
  meta.setDisplayName(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(nameComponent));
61
61
  }
62
62
  if (item.getLore() != null) {
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java CHANGED
@@ -30,7 +30,7 @@ import com.plotsquared.core.plot.PlotArea;
30
30
  import com.plotsquared.core.plot.PlotManager;
31
31
  import com.plotsquared.core.queue.GlobalBlockQueue;
32
32
  import com.plotsquared.core.queue.QueueCoordinator;
33
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
33
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
34
34
  import com.plotsquared.core.util.ChunkManager;
35
35
  import com.plotsquared.core.util.RegionManager;
36
36
  import com.plotsquared.core.util.WorldUtil;
@@ -70,7 +70,7 @@ public class BukkitRegionManager extends RegionManager {
70
70
  @Inject
71
71
  public BukkitRegionManager(
72
72
  @NonNull WorldUtil worldUtil, @NonNull GlobalBlockQueue blockQueue, @NonNull
73
- ProgressSubscriberFactory subscriberFactory
73
+ ProgressSubscriberFactory subscriberFactory
74
74
  ) {
75
75
  super(worldUtil, blockQueue, subscriberFactory);
76
76
  this.blockQueue = blockQueue;
@@ -257,9 +257,9 @@ public class BukkitRegionManager extends RegionManager {
257
257
  map.saveEntitiesOut(Bukkit.getWorld(world.getName()).getChunkAt(x, z), currentPlotClear);
258
258
  AugmentedUtils.bypass(
259
259
  ignoreAugment,
260
- () -> ChunkManager.setChunkInPlotArea(null, new RunnableVal<ScopedQueueCoordinator>() {
260
+ () -> ChunkManager.setChunkInPlotArea(null, new RunnableVal<ZeroedDelegateScopedQueueCoordinator>() {
261
261
  @Override
262
- public void run(ScopedQueueCoordinator value) {
262
+ public void run(ZeroedDelegateScopedQueueCoordinator value) {
263
263
  Location min = value.getMin();
264
264
  int bx = min.getX();
265
265
  int bz = min.getZ();
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java CHANGED
@@ -124,7 +124,7 @@ public class BukkitSetupUtils extends SetupUtils {
124
124
  public String setupWorld(PlotAreaBuilder builder) {
125
125
  this.updateGenerators(false);
126
126
  ConfigurationNode[] steps = builder.settingsNodesWrapper() == null ?
127
- new ConfigurationNode[0] : builder.settingsNodesWrapper().getSettingsNodes();
127
+ new ConfigurationNode[0] : builder.settingsNodesWrapper().settingsNodes();
128
128
  String world = builder.worldName();
129
129
  PlotAreaType type = builder.plotAreaType();
130
130
  String worldPath = "worlds." + builder.worldName();
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java CHANGED
@@ -45,7 +45,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
45
45
  import io.papermc.lib.PaperLib;
46
46
  import net.kyori.adventure.platform.bukkit.BukkitAudiences;
47
47
  import net.kyori.adventure.text.minimessage.MiniMessage;
48
- import net.kyori.adventure.text.minimessage.Template;
48
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
49
49
  import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
50
50
  import org.apache.logging.log4j.LogManager;
51
51
  import org.apache.logging.log4j.Logger;
@@ -333,7 +333,7 @@ public class BukkitUtil extends WorldUtil {
333
333
  @SuppressWarnings("deprecation")
334
334
  public void setSign(
335
335
  final @NonNull Location location, final @NonNull Caption[] lines,
336
- final @NonNull Template... replacements
336
+ final @NonNull TagResolver... replacements
337
337
  ) {
338
338
  ensureLoaded(location.getWorldName(), location.getX(), location.getZ(), chunk -> {
339
339
  PlotArea area = location.getPlotArea();
@@ -366,8 +366,9 @@ public class BukkitUtil extends WorldUtil {
366
366
  final org.bukkit.block.BlockState blockstate = block.getState();
367
367
  if (blockstate instanceof final Sign sign) {
368
368
  for (int i = 0; i < lines.length; i++) {
369
- sign.setLine(i, LEGACY_COMPONENT_SERIALIZER
370
- .serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()), replacements)));
369
+ sign.setLine(i, LEGACY_COMPONENT_SERIALIZER.serialize(
370
+ MINI_MESSAGE.deserialize(lines[i].getComponent(LocaleHolder.console()), replacements)
371
+ ));
371
372
  }
372
373
  sign.update(true, false);
373
374
  }
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java CHANGED
@@ -132,14 +132,6 @@ public class BukkitWorld implements World<org.bukkit.World> {
132
132
  return world.hashCode();
133
133
  }
134
134
 
135
- /**
136
- * @deprecated This method is not meant to be invoked or overridden, with no replacement.
137
- */
138
- @Deprecated(forRemoval = true, since = "6.6.0")
139
- protected boolean canEqual(final Object other) {
140
- return other instanceof BukkitWorld;
141
- }
142
-
143
135
  public String toString() {
144
136
  return "BukkitWorld(world=" + this.world + ")";
145
137
  }
Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java ADDED
@@ -0,0 +1,64 @@
1
+ /*
2
+ * PlotSquared, a land and world management plugin for Minecraft.
3
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
+ * Copyright (C) IntellectualSites team and contributors
5
+ *
6
+ * This program is free software: you can redistribute it and/or modify
7
+ * it under the terms of the GNU General Public License as published by
8
+ * the Free Software Foundation, either version 3 of the License, or
9
+ * (at your option) any later version.
10
+ *
11
+ * This program is distributed in the hope that it will be useful,
12
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
+ * GNU General Public License for more details.
15
+ *
16
+ * You should have received a copy of the GNU General Public License
17
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
+ */
19
+ package com.plotsquared.bukkit.util;
20
+
21
+ import com.intellectualsites.annotations.NotPublic;
22
+ import com.plotsquared.core.PlotSquared;
23
+
24
+ import java.io.IOException;
25
+ import java.nio.file.Files;
26
+ import java.nio.file.Path;
27
+ import java.nio.file.Paths;
28
+ import java.util.stream.Stream;
29
+
30
+ /**
31
+ * This is a helper class which replaces occurrences of 'suggest_command' with 'run_command' in messages_%.json.
32
+ * MiniMessage changed the syntax between major releases. To warrant a smooth upgrade, we attempt to replace any occurrences
33
+ * while loading PlotSquared.
34
+ *
35
+ * @since 7.0.0
36
+ */
37
+ @NotPublic
38
+ public class TranslationUpdateManager {
39
+
40
+ public static void upgradeTranslationFile() throws IOException {
41
+ String searchText = "suggest_command";
42
+ String replacementText = "run_command";
43
+
44
+ try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
45
+ paths
46
+ .filter(Files::isRegularFile)
47
+ .filter(p -> p.getFileName().toString().matches("messages_[a-z]{2}\\.json"))
48
+ .forEach(p -> replaceInFile(p, searchText, replacementText));
49
+ }
50
+ }
51
+
52
+ private static void replaceInFile(Path path, String searchText, String replacementText) {
53
+ try {
54
+ String content = Files.readString(path);
55
+ if (content.contains(searchText)) {
56
+ content = content.replaceAll(searchText, replacementText);
57
+ Files.writeString(path, content);
58
+ }
59
+ } catch (IOException e) {
60
+ e.printStackTrace();
61
+ }
62
+ }
63
+
64
+ }
Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java CHANGED
@@ -54,7 +54,8 @@ public class UpdateUtility implements Listener {
54
54
  internalVersion = PlotSquared.get().getVersion();
55
55
  }
56
56
 
57
- @SuppressWarnings({"deprecation", "DefaultCharset"}) // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet
57
+ @SuppressWarnings({"deprecation", "DefaultCharset"})
58
+ // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet
58
59
  public void updateChecker() {
59
60
  task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
60
61
  try {
Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweRegionManager.java CHANGED
@@ -94,11 +94,6 @@ public class FaweRegionManager extends BukkitRegionManager {
94
94
  delegate.swap(pos1, pos2, swapPos, whenDone);
95
95
  }
96
96
 
97
- @Override
98
- public void setBiome(CuboidRegion region, int extendBiome, BiomeType biome, String world, Runnable whenDone) {
99
- delegate.setBiome(region, extendBiome, biome, world, whenDone);
100
- }
101
-
102
97
  @Override
103
98
  public void setBiome(CuboidRegion region, int extendBiome, BiomeType biome, PlotArea area, Runnable whenDone) {
104
99
  delegate.setBiome(region, extendBiome, biome, area.getWorldName(), whenDone);
Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java CHANGED
@@ -111,8 +111,8 @@ public class SQLiteUUIDService implements UUIDService, Consumer<List<UUIDMapping
111
111
  try (final PreparedStatement statement = getConnection()
112
112
  .prepareStatement("INSERT OR REPLACE INTO `usercache` (`uuid`, `username`) VALUES(?, ?)")) {
113
113
  for (final UUIDMapping mapping : uuidWrappers) {
114
- statement.setString(1, mapping.getUuid().toString());
115
- statement.setString(2, mapping.getUsername());
114
+ statement.setString(1, mapping.uuid().toString());
115
+ statement.setString(2, mapping.username());
116
116
  statement.executeUpdate();
117
117
  }
118
118
  } catch (SQLException e) {
Bukkit/src/main/resources/plugin.yml CHANGED
@@ -4,16 +4,16 @@ api-version: "1.13"
4
4
  version: "${version}"
5
5
  load: STARTUP
6
6
  description: "Easy, yet powerful Plot World generation and management."
7
- authors: [Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell]
7
+ authors: [ Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell ]
8
8
  website: https://www.spigotmc.org/resources/77506/
9
- softdepend: [Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI]
10
- loadbefore: [MultiWorld, Multiverse-Core]
11
- depend: [WorldEdit]
9
+ softdepend: [ Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI ]
10
+ loadbefore: [ MultiWorld, Multiverse-Core ]
11
+ depend: [ WorldEdit ]
12
12
  database: false
13
13
  commands:
14
14
  plots:
15
15
  description: Plot command.
16
- aliases: [p,plot,ps,plotsquared,p2,2,plotme]
16
+ aliases: [ p,plot,ps,plotsquared,p2,2,plotme ]
17
17
  permission: plots.use
18
18
  permission-message: "You are lacking the permission node 'plots.use'"
19
19
  permissions:
CODE_OF_CONDUCT.md CHANGED
@@ -23,13 +23,13 @@ include:
23
23
  Examples of unacceptable behavior by participants include:
24
24
 
25
25
  * The use of sexualized language or imagery and unwelcome sexual attention or
26
- advances
26
+ advances
27
27
  * Trolling, insulting/derogatory comments, and personal or political attacks
28
28
  * Public or private harassment
29
29
  * Publishing others' private information, such as a physical or electronic
30
- address, without explicit permission
30
+ address, without explicit permission
31
31
  * Other conduct which could reasonably be considered inappropriate in a
32
- professional setting
32
+ professional setting
33
33
 
34
34
  ## Our Responsibilities
35
35
 
Core/build.gradle.kts CHANGED
@@ -68,7 +68,8 @@ tasks {
68
68
  val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
69
69
  val opt = options as StandardJavadocDocletOptions
70
70
  opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
71
- opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
71
+ opt.links("https://jd.advntr.dev/api/4.14.0/")
72
+ opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
72
73
  opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
73
74
  opt.links("https://checkerframework.org/api/")
74
75
  opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
Core/src/main/java/com/plotsquared/core/PlotAPI.java CHANGED
@@ -30,7 +30,7 @@ import com.plotsquared.core.util.ChunkManager;
30
30
  import com.plotsquared.core.util.EventDispatcher;
31
31
  import com.plotsquared.core.util.SchematicHandler;
32
32
  import com.plotsquared.core.util.query.PlotQuery;
33
- import net.kyori.adventure.text.minimessage.Template;
33
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
34
34
  import org.checkerframework.checker.nullness.qual.NonNull;
35
35
  import org.checkerframework.checker.nullness.qual.Nullable;
36
36
 
@@ -145,7 +145,7 @@ public class PlotAPI {
145
145
  */
146
146
  public void sendConsoleMessage(
147
147
  final @NonNull String message,
148
- final @NonNull Template @NonNull ... replacements
148
+ final @NonNull TagResolver @NonNull ... replacements
149
149
  ) {
150
150
  ConsolePlayer.getConsole().sendMessage(StaticCaption.of(message), replacements);
151
151
  }
@@ -158,7 +158,7 @@ public class PlotAPI {
158
158
  */
159
159
  public void sendConsoleMessage(
160
160
  final @NonNull Caption caption,
161
- final @NonNull Template @NonNull ... replacements
161
+ final @NonNull TagResolver @NonNull ... replacements
162
162
  ) {
163
163
  ConsolePlayer.getConsole().sendMessage(caption, replacements);
164
164
  }
Core/src/main/java/com/plotsquared/core/PlotSquared.java CHANGED
@@ -270,7 +270,11 @@ public class PlotSquared {
270
270
  captionMap = this.captionLoader.loadAll(this.platform.getDirectory().toPath().resolve("lang"));
271
271
  } else {
272
272
  String fileName = "messages_" + Settings.Enabled_Components.DEFAULT_LOCALE + ".json";
273
- captionMap = this.captionLoader.loadOrCreateSingle(this.platform.getDirectory().toPath().resolve("lang").resolve(fileName));
273
+ captionMap = this.captionLoader.loadOrCreateSingle(this.platform
274
+ .getDirectory()
275
+ .toPath()
276
+ .resolve("lang")
277
+ .resolve(fileName));
274
278
  }
275
279
  this.captionMaps.put(TranslatableCaption.DEFAULT_NAMESPACE, captionMap);
276
280
  LOGGER.info(
@@ -790,7 +794,9 @@ public class PlotSquared {
790
794
  if (world.equals("CheckingPlotSquaredGenerator")) {
791
795
  return;
792
796
  }
793
- this.getPlotAreaManager().addWorld(world);
797
+ if (!this.getPlotAreaManager().addWorld(world)) {
798
+ return;
799
+ }
794
800
  Set<String> worlds;
795
801
  if (this.worldConfiguration.contains("worlds")) {
796
802
  worlds = this.worldConfiguration.getConfigurationSection("worlds").getKeys(false);
@@ -1009,7 +1015,7 @@ public class PlotSquared {
1009
1015
 
1010
1016
  /**
1011
1017
  * Setup the configuration for a plot world based on world arguments.
1012
- *
1018
+ * <p>
1013
1019
  *
1014
1020
  * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
1015
1021
  *
Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java CHANGED
@@ -200,7 +200,7 @@ public class PlayerBackupProfile implements BackupProfile {
200
200
  if (value) {
201
201
  future.complete(null);
202
202
  } else {
203
- future.completeExceptionally(new RuntimeException(MINI_MESSAGE.stripTokens(
203
+ future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
204
204
  TranslatableCaption
205
205
  .of("schematics.schematic_paste_failed")
206
206
  .getComponent(ConsolePlayer.getConsole()))));
Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java CHANGED
@@ -24,13 +24,14 @@ import com.google.inject.Inject;
24
24
  import com.google.inject.Singleton;
25
25
  import com.plotsquared.core.PlotSquared;
26
26
  import com.plotsquared.core.configuration.Settings;
27
- import com.plotsquared.core.configuration.caption.Templates;
28
27
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
29
28
  import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
30
29
  import com.plotsquared.core.player.PlotPlayer;
31
30
  import com.plotsquared.core.plot.Plot;
32
31
  import com.plotsquared.core.util.task.TaskManager;
33
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.minimessage.tag.Tag;
34
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
34
35
  import org.checkerframework.checker.nullness.qual.NonNull;
35
36
  import org.checkerframework.checker.nullness.qual.Nullable;
36
37
 
@@ -100,7 +101,7 @@ public class SimpleBackupManager implements BackupManager {
100
101
  if (player != null) {
101
102
  player.sendMessage(
102
103
  TranslatableCaption.of("backups.backup_automatic_started"),
103
- Template.of("plot", plot.getId().toString())
104
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
104
105
  );
105
106
  }
106
107
  profile.createBackup().whenComplete((backup, throwable) -> {
@@ -108,7 +109,7 @@ public class SimpleBackupManager implements BackupManager {
108
109
  if (player != null) {
109
110
  player.sendMessage(
110
111
  TranslatableCaption.of("backups.backup_automatic_failure"),
111
- Templates.of("reason", throwable.getMessage())
112
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
112
113
  );
113
114
  }
114
115
  throwable.printStackTrace();
@@ -135,13 +136,9 @@ public class SimpleBackupManager implements BackupManager {
135
136
  return this.backupLimit;
136
137
  }
137
138
 
138
- private static final class PlotCacheKey {
139
-
140
- private final Plot plot;
141
-
142
- private PlotCacheKey(Plot plot) {
143
- this.plot = plot;
144
- }
139
+ private record PlotCacheKey(
140
+ Plot plot
141
+ ) {
145
142
 
146
143
  @Override
147
144
  public boolean equals(final Object o) {
Core/src/main/java/com/plotsquared/core/command/Add.java CHANGED
@@ -30,7 +30,9 @@ import com.plotsquared.core.util.PlayerManager;
30
30
  import com.plotsquared.core.util.TabCompletions;
31
31
  import com.plotsquared.core.util.task.RunnableVal2;
32
32
  import com.plotsquared.core.util.task.RunnableVal3;
33
- import net.kyori.adventure.text.minimessage.Template;
33
+ import net.kyori.adventure.text.Component;
34
+ import net.kyori.adventure.text.minimessage.tag.Tag;
35
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
34
36
  import org.checkerframework.checker.nullness.qual.NonNull;
35
37
 
36
38
  import java.util.Collection;
@@ -71,7 +73,7 @@ public class Add extends Command {
71
73
  checkTrue(
72
74
  args.length == 1,
73
75
  TranslatableCaption.of("commandconfig.command_syntax"),
74
- Template.of("value", "/plot add <player | *>")
76
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot add <player | *>")))
75
77
  );
76
78
  final CompletableFuture<Boolean> future = new CompletableFuture<>();
77
79
  PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> {
@@ -81,7 +83,7 @@ public class Add extends Command {
81
83
  } else {
82
84
  player.sendMessage(
83
85
  TranslatableCaption.of("errors.invalid_player"),
84
- Template.of("value", args[0])
86
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
85
87
  );
86
88
  }
87
89
  future.completeExceptionally(throwable);
@@ -89,7 +91,7 @@ public class Add extends Command {
89
91
  } else {
90
92
  try {
91
93
  checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
92
- Template.of("value", args[0])
94
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
93
95
  );
94
96
  Iterator<UUID> iterator = uuids.iterator();
95
97
  int size = plot.getTrusted().size() + plot.getMembers().size();
@@ -99,7 +101,9 @@ public class Add extends Command {
99
101
  Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
100
102
  player.sendMessage(
101
103
  TranslatableCaption.of("errors.invalid_player"),
102
- Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
104
+ TagResolver.resolver("value", Tag.inserting(
105
+ PlayerManager.resolveName(uuid).toComponent(player)
106
+ ))
103
107
  );
104
108
  iterator.remove();
105
109
  continue;
@@ -107,7 +111,9 @@ public class Add extends Command {
107
111
  if (plot.isOwner(uuid)) {
108
112
  player.sendMessage(
109
113
  TranslatableCaption.of("member.already_added"),
110
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
114
+ TagResolver.resolver("player", Tag.inserting(
115
+ PlayerManager.resolveName(uuid).toComponent(player)
116
+ ))
111
117
  );
112
118
  iterator.remove();
113
119
  continue;
@@ -115,7 +121,9 @@ public class Add extends Command {
115
121
  if (plot.getMembers().contains(uuid)) {
116
122
  player.sendMessage(
117
123
  TranslatableCaption.of("member.already_added"),
118
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
124
+ TagResolver.resolver("player", Tag.inserting(
125
+ PlayerManager.resolveName(uuid).toComponent(player)
126
+ ))
119
127
  );
120
128
  iterator.remove();
121
129
  continue;
@@ -128,7 +136,7 @@ public class Add extends Command {
128
136
  if (localAddSize >= maxAddSize) {
129
137
  player.sendMessage(
130
138
  TranslatableCaption.of("members.plot_max_members_added"),
131
- Template.of("amount", String.valueOf(localAddSize))
139
+ TagResolver.resolver("amount", Tag.inserting(Component.text(localAddSize)))
132
140
  );
133
141
  return;
134
142
  }
Core/src/main/java/com/plotsquared/core/command/Alias.java CHANGED
@@ -27,7 +27,9 @@ import com.plotsquared.core.player.PlotPlayer;
27
27
  import com.plotsquared.core.plot.Plot;
28
28
  import com.plotsquared.core.util.MathMan;
29
29
  import com.plotsquared.core.util.query.PlotQuery;
30
- import net.kyori.adventure.text.minimessage.Template;
30
+ import net.kyori.adventure.text.Component;
31
+ import net.kyori.adventure.text.minimessage.tag.Tag;
32
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
31
33
 
32
34
  import java.util.ArrayList;
33
35
  import java.util.Collection;
@@ -91,7 +93,10 @@ public class Alias extends SubCommand {
91
93
  } else {
92
94
  player.sendMessage(
93
95
  TranslatableCaption.of("permission.no_permission"),
94
- Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_SET))
96
+ TagResolver.resolver(
97
+ "node",
98
+ Tag.inserting(Permission.PERMISSION_ALIAS_SET)
99
+ )
95
100
  );
96
101
  }
97
102
  }
@@ -107,7 +112,10 @@ public class Alias extends SubCommand {
107
112
  } else {
108
113
  player.sendMessage(
109
114
  TranslatableCaption.of("permission.no_permission"),
110
- Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_REMOVE))
115
+ TagResolver.resolver(
116
+ "node",
117
+ Tag.inserting(Permission.PERMISSION_ALIAS_REMOVE)
118
+ )
111
119
  );
112
120
  }
113
121
  }
@@ -148,13 +156,16 @@ public class Alias extends SubCommand {
148
156
  .anyMatch()) {
149
157
  player.sendMessage(
150
158
  TranslatableCaption.of("alias.alias_is_taken"),
151
- Template.of("alias", alias)
159
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
152
160
  );
153
161
  return;
154
162
  }
155
163
  if (Settings.UUID.OFFLINE) {
156
164
  plot.setAlias(alias);
157
- player.sendMessage(TranslatableCaption.of("alias.alias_set_to"), Template.of("alias", alias));
165
+ player.sendMessage(
166
+ TranslatableCaption.of("alias.alias_set_to"),
167
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
168
+ );
158
169
  return;
159
170
  }
160
171
  PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
@@ -163,13 +174,13 @@ public class Alias extends SubCommand {
163
174
  } else if (uuid != null) {
164
175
  player.sendMessage(
165
176
  TranslatableCaption.of("alias.alias_is_taken"),
166
- Template.of("alias", alias)
177
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
167
178
  );
168
179
  } else {
169
180
  plot.setAlias(alias);
170
181
  player.sendMessage(
171
182
  TranslatableCaption.of("alias.alias_set_to"),
172
- Template.of("alias", alias)
183
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
173
184
  );
174
185
  }
175
186
  }));
@@ -181,7 +192,7 @@ public class Alias extends SubCommand {
181
192
  if (!plot.getAlias().isEmpty()) {
182
193
  player.sendMessage(
183
194
  TranslatableCaption.of("alias.alias_removed"),
184
- Template.of("alias", alias)
195
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
185
196
  );
186
197
  } else {
187
198
  player.sendMessage(
Core/src/main/java/com/plotsquared/core/command/Area.java CHANGED
@@ -24,7 +24,6 @@ import com.plotsquared.core.configuration.ConfigurationSection;
24
24
  import com.plotsquared.core.configuration.ConfigurationUtil;
25
25
  import com.plotsquared.core.configuration.Settings;
26
26
  import com.plotsquared.core.configuration.caption.CaptionHolder;
27
- import com.plotsquared.core.configuration.caption.Templates;
28
27
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
29
28
  import com.plotsquared.core.configuration.file.YamlConfiguration;
30
29
  import com.plotsquared.core.events.TeleportCause;
@@ -69,7 +68,9 @@ import com.sk89q.worldedit.math.BlockVector3;
69
68
  import com.sk89q.worldedit.regions.CuboidRegion;
70
69
  import com.sk89q.worldedit.regions.Region;
71
70
  import com.sk89q.worldedit.world.World;
72
- import net.kyori.adventure.text.minimessage.Template;
71
+ import net.kyori.adventure.text.Component;
72
+ import net.kyori.adventure.text.minimessage.tag.Tag;
73
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
73
74
  import org.checkerframework.checker.nullness.qual.NonNull;
74
75
 
75
76
  import java.io.File;
@@ -141,14 +142,17 @@ public class Area extends SubCommand {
141
142
  if (!player.hasPermission(Permission.PERMISSION_AREA_CREATE)) {
142
143
  player.sendMessage(
143
144
  TranslatableCaption.of("permission.no_permission"),
144
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
145
+ TagResolver.resolver(
146
+ "node",
147
+ Tag.inserting(Permission.PERMISSION_AREA_CREATE)
148
+ )
145
149
  );
146
150
  return false;
147
151
  }
148
152
  if (args.length < 2) {
149
153
  player.sendMessage(
150
154
  TranslatableCaption.of("single.single_area_needs_name"),
151
- Template.of("command", "/plot area single <name>")
155
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot area single <name>")))
152
156
  );
153
157
  return false;
154
158
  }
@@ -279,7 +283,7 @@ public class Area extends SubCommand {
279
283
  } else {
280
284
  player.sendMessage(
281
285
  TranslatableCaption.of("errors.error_create"),
282
- Template.of("world", hybridPlotWorld.getWorldName())
286
+ TagResolver.resolver("world", Tag.inserting(Component.text(hybridPlotWorld.getWorldName())))
283
287
  );
284
288
  }
285
289
  };
@@ -290,7 +294,10 @@ public class Area extends SubCommand {
290
294
  if (!player.hasPermission(Permission.PERMISSION_AREA_CREATE)) {
291
295
  player.sendMessage(
292
296
  TranslatableCaption.of("permission.no_permission"),
293
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
297
+ TagResolver.resolver(
298
+ "node",
299
+ Tag.inserting(Permission.PERMISSION_AREA_CREATE)
300
+ )
294
301
  );
295
302
  return false;
296
303
  }
@@ -298,7 +305,10 @@ public class Area extends SubCommand {
298
305
  case 1:
299
306
  player.sendMessage(
300
307
  TranslatableCaption.of("commandconfig.command_syntax"),
301
- Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
308
+ TagResolver.resolver(
309
+ "value",
310
+ Tag.inserting(Component.text("/plot area create [world[:id]] [<modifier>=<value>]..."))
311
+ )
302
312
  );
303
313
  return false;
304
314
  case 2:
@@ -312,7 +322,11 @@ public class Area extends SubCommand {
312
322
  if (area == null) {
313
323
  player.sendMessage(
314
324
  TranslatableCaption.of("commandconfig.command_syntax"),
315
- Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
325
+ TagResolver.resolver(
326
+ "value",
327
+ Tag.inserting(Component.text(
328
+ "/plot area create [world[:id]] [<modifier>=<value>]..."))
329
+ )
316
330
  );
317
331
  return false;
318
332
  }
@@ -323,12 +337,18 @@ public class Area extends SubCommand {
323
337
  );
324
338
  player.sendMessage(
325
339
  TranslatableCaption.of("set.set_attribute"),
326
- Template.of("attribute", "area_pos1"),
327
- Template.of("value", location.getX() + "," + location.getZ())
340
+ TagResolver.builder()
341
+ .tag("attribute", Tag.inserting(Component.text("area_pos1")))
342
+ .tag("value", Tag.inserting(
343
+ Component.text(location.getX())
344
+ .append(Component.text(","))
345
+ .append(Component.text(location.getZ()))
346
+ ))
347
+ .build()
328
348
  );
329
349
  player.sendMessage(
330
350
  TranslatableCaption.of("area.set_pos2"),
331
- Template.of("command", "/plot area create pos2")
351
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot area create pos2")))
332
352
  );
333
353
  return true;
334
354
  }
@@ -342,7 +362,11 @@ public class Area extends SubCommand {
342
362
  if (area == null) {
343
363
  player.sendMessage(
344
364
  TranslatableCaption.of("commandconfig.command_syntax"),
345
- Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
365
+ TagResolver.resolver(
366
+ "value",
367
+ Tag.inserting(Component.text(
368
+ "/plot area create [world[:id]] [<modifier>=<value>]..."))
369
+ )
346
370
  );
347
371
  return false;
348
372
  }
@@ -369,7 +393,10 @@ public class Area extends SubCommand {
369
393
  if (!areas.isEmpty()) {
370
394
  player.sendMessage(
371
395
  TranslatableCaption.of("cluster.cluster_intersection"),
372
- Template.of("cluster", areas.iterator().next().toString())
396
+ TagResolver.resolver(
397
+ "cluster",
398
+ Tag.inserting(areas.iterator().next())
399
+ )
373
400
  );
374
401
  return false;
375
402
  }
@@ -395,8 +422,7 @@ public class Area extends SubCommand {
395
422
  player.sendMessage(TranslatableCaption.of("setup.setup_finished"));
396
423
  if (area.getTerrain() != PlotAreaTerrainType.ALL) {
397
424
  QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(world));
398
- queue.setChunkConsumer(chunk -> AugmentedUtils.generate(
399
- null,
425
+ queue.setChunkConsumer(chunk -> AugmentedUtils.generateChunk(
400
426
  world,
401
427
  chunk.getX(),
402
428
  chunk.getZ(),
@@ -408,7 +434,7 @@ public class Area extends SubCommand {
408
434
  } else {
409
435
  player.sendMessage(
410
436
  TranslatableCaption.of("errors.error_create"),
411
- Template.of("world", area.getWorldName())
437
+ TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
412
438
  );
413
439
  }
414
440
  };
@@ -442,7 +468,7 @@ public class Area extends SubCommand {
442
468
  if (other != null && Objects.equals(pa.getId(), other.getId())) {
443
469
  player.sendMessage(
444
470
  TranslatableCaption.of("setup.setup_world_taken"),
445
- Template.of("value", pa.toString())
471
+ TagResolver.resolver("value", Tag.inserting(Component.text(pa.getId())))
446
472
  );
447
473
  return false;
448
474
  }
@@ -457,8 +483,13 @@ public class Area extends SubCommand {
457
483
  if (pair.length != 2) {
458
484
  player.sendMessage(
459
485
  TranslatableCaption.of("commandconfig.command_syntax_extended"),
460
- Template.of("value1,", getCommandString()),
461
- Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
486
+ TagResolver.builder()
487
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
488
+ .tag(
489
+ "value2",
490
+ Tag.inserting(Component.text("create [world[:id]] [<modifier>=<value>]..."))
491
+ )
492
+ .build()
462
493
  );
463
494
  return false;
464
495
  }
@@ -494,8 +525,14 @@ public class Area extends SubCommand {
494
525
  default -> {
495
526
  player.sendMessage(
496
527
  TranslatableCaption.of("commandconfig.command_syntax_extended"),
497
- Template.of("value1", getCommandString()),
498
- Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
528
+ TagResolver.builder()
529
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
530
+ .tag(
531
+ "value2",
532
+ Tag.inserting(Component.text(
533
+ " create [world[:id]] [<modifier>=<value>]..."))
534
+ )
535
+ .build()
499
536
  );
500
537
  return false;
501
538
  }
@@ -505,7 +542,7 @@ public class Area extends SubCommand {
505
542
  if (this.worldUtil.isWorld(pa.getWorldName())) {
506
543
  player.sendMessage(
507
544
  TranslatableCaption.of("setup.setup_world_taken"),
508
- Template.of("value", pa.getWorldName())
545
+ TagResolver.resolver("value", Tag.inserting(Component.text(pa.getWorldName())))
509
546
  );
510
547
  return false;
511
548
  }
@@ -526,7 +563,7 @@ public class Area extends SubCommand {
526
563
  } else {
527
564
  player.sendMessage(
528
565
  TranslatableCaption.of("errors.error_create"),
529
- Template.of("world", pa.getWorldName())
566
+ TagResolver.resolver("world", Tag.inserting(Component.text(pa.getWorldName())))
530
567
  );
531
568
  }
532
569
  try {
@@ -545,12 +582,18 @@ public class Area extends SubCommand {
545
582
  if (pa.getId() == null) {
546
583
  player.sendMessage(
547
584
  TranslatableCaption.of("commandconfig.command_syntax"),
548
- Template.of("value", getUsage())
585
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
549
586
  );
550
587
  player.sendMessage(
551
588
  TranslatableCaption.of("commandconfig.command_syntax_extended"),
552
- Template.of("value1", getCommandString()),
553
- Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
589
+ TagResolver.builder()
590
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
591
+ .tag(
592
+ "value2",
593
+ Tag.inserting(Component.text(
594
+ " create [world[:id]] [<modifier>=<value>]..."))
595
+ )
596
+ .build()
554
597
  );
555
598
  return false;
556
599
  }
@@ -567,7 +610,7 @@ public class Area extends SubCommand {
567
610
  metaData.computeIfAbsent(player.getUUID(), missingUUID -> new HashMap<>()).put("area_create_area", pa);
568
611
  player.sendMessage(
569
612
  TranslatableCaption.of("single.get_position"),
570
- Template.of("command", getCommandString())
613
+ TagResolver.resolver("command", Tag.inserting(Component.text(getCommandString())))
571
614
  );
572
615
  break;
573
616
  }
@@ -577,7 +620,10 @@ public class Area extends SubCommand {
577
620
  if (!player.hasPermission(Permission.PERMISSION_AREA_INFO)) {
578
621
  player.sendMessage(
579
622
  TranslatableCaption.of("permission.no_permission"),
580
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_INFO))
623
+ TagResolver.resolver(
624
+ "node",
625
+ Tag.inserting(Permission.PERMISSION_AREA_INFO)
626
+ )
581
627
  );
582
628
  return false;
583
629
  }
@@ -588,15 +634,20 @@ public class Area extends SubCommand {
588
634
  default -> {
589
635
  player.sendMessage(
590
636
  TranslatableCaption.of("commandconfig.command_syntax_extended"),
591
- Template.of("value1", getCommandString()),
592
- Template.of("value2", " info [area]")
637
+ TagResolver.builder()
638
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
639
+ .tag("value2", Tag.inserting(Component.text(" info [area]")))
640
+ .build()
593
641
  );
594
642
  return false;
595
643
  }
596
644
  }
597
645
  if (area == null) {
598
646
  if (args.length == 2) {
599
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"), Template.of("value", args[1]));
647
+ player.sendMessage(
648
+ TranslatableCaption.of("errors.not_valid_plot_world"),
649
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
650
+ );
600
651
  } else {
601
652
  player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
602
653
  }
@@ -620,42 +671,35 @@ public class Area extends SubCommand {
620
671
  percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
621
672
  region = "N/A";
622
673
  }
623
- Template headerTemplate = Template.of(
624
- "header",
625
- TranslatableCaption.of("info.plot_info_header").getComponent(player)
626
- );
627
- Template nameTemplate = Template.of("name", name);
628
- Template typeTemplate = Template.of("type", area.getType().name());
629
- Template terrainTemplate = Template.of("terrain", area.getTerrain().name());
630
- Template usageTemplate = Template.of("usage", String.format("%.2f", percent));
631
- Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
632
- Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
633
- Template regionTemplate = Template.of("region", region);
634
- Template generatorTemplate = Template.of("generator", generator);
635
- Template footerTemplate = Template.of(
636
- "footer",
637
- TranslatableCaption.of("info.plot_info_footer").getComponent(player)
638
- );
639
- player.sendMessage(
640
- TranslatableCaption.of("info.area_info_format"),
641
- headerTemplate,
642
- nameTemplate,
643
- typeTemplate,
644
- terrainTemplate,
645
- usageTemplate,
646
- claimedTemplate,
647
- clustersTemplate,
648
- regionTemplate,
649
- generatorTemplate,
650
- footerTemplate
651
- );
674
+ TagResolver resolver = TagResolver.builder()
675
+ .tag(
676
+ "header",
677
+ Tag.inserting(TranslatableCaption.of("info.plot_info_header").toComponent(player))
678
+ )
679
+ .tag("name", Tag.inserting(Component.text(name)))
680
+ .tag("type", Tag.inserting(Component.text(area.getType().name())))
681
+ .tag("terrain", Tag.inserting(Component.text(area.getTerrain().name())))
682
+ .tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent))))
683
+ .tag("claimed", Tag.inserting(Component.text(claimed)))
684
+ .tag("clusters", Tag.inserting(Component.text(clusters)))
685
+ .tag("region", Tag.inserting(Component.text(region)))
686
+ .tag("generator", Tag.inserting(Component.text(generator)))
687
+ .tag(
688
+ "footer",
689
+ Tag.inserting(TranslatableCaption.of("info.plot_info_footer").toComponent(player))
690
+ )
691
+ .build();
692
+ player.sendMessage(TranslatableCaption.of("info.area_info_format"), resolver);
652
693
  return true;
653
694
  }
654
695
  case "l", "list" -> {
655
696
  if (!player.hasPermission(Permission.PERMISSION_AREA_LIST)) {
656
697
  player.sendMessage(
657
698
  TranslatableCaption.of("permission.no_permission"),
658
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_LIST))
699
+ TagResolver.resolver(
700
+ "node",
701
+ Tag.inserting(Permission.PERMISSION_AREA_LIST)
702
+ )
659
703
  );
660
704
  return false;
661
705
  }
@@ -672,8 +716,10 @@ public class Area extends SubCommand {
672
716
  default:
673
717
  player.sendMessage(
674
718
  TranslatableCaption.of("commandconfig.command_syntax_extended"),
675
- Template.of("value1", getCommandString()),
676
- Template.of("value2", " list [#]")
719
+ TagResolver.builder()
720
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
721
+ .tag("value2", Tag.inserting(Component.text(" list [#]")))
722
+ .build()
677
723
  );
678
724
  return false;
679
725
  }
@@ -699,37 +745,27 @@ public class Area extends SubCommand {
699
745
  percent = claimed == 0 ? 0 : (double) claimed / Short.MAX_VALUE * Short.MAX_VALUE;
700
746
  region = "N/A";
701
747
  }
702
- Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
703
- Template usageTemplate = Template.of("usage", String.format("%.2f", percent) + "%");
704
- Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
705
- Template regionTemplate = Template.of("region", region);
706
- Template generatorTemplate = Template.of("generator", generator);
707
- String tooltip = MINI_MESSAGE.serialize(MINI_MESSAGE
708
- .parse(
709
- TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
710
- claimedTemplate,
711
- usageTemplate,
712
- clustersTemplate,
713
- regionTemplate,
714
- generatorTemplate
715
- ));
716
- Template tooltipTemplate = Template.of("hover_info", tooltip);
717
- Template visitcmdTemplate = Template.of("command_tp", "/plot area tp " + area);
718
- Template infocmdTemplate = Template.of("command_info", "/plot area info " + area);
719
- Template numberTemplate = Template.of("number", String.valueOf(i));
720
- Template nameTemplate = Template.of("area_name", name);
721
- Template typeTemplate = Template.of("area_type", area.getType().name());
722
- Template terrainTemplate = Template.of("area_terrain", area.getTerrain().name());
723
- caption.set(TranslatableCaption.of("info.area_list_item"));
724
- caption.setTemplates(
725
- tooltipTemplate,
726
- visitcmdTemplate,
727
- numberTemplate,
728
- nameTemplate,
729
- typeTemplate,
730
- terrainTemplate,
731
- infocmdTemplate
748
+ Component tooltip = MINI_MESSAGE.deserialize(
749
+ TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
750
+ TagResolver.builder()
751
+ .tag("claimed", Tag.inserting(Component.text(claimed)))
752
+ .tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent) + "%")))
753
+ .tag("clusters", Tag.inserting(Component.text(clusters)))
754
+ .tag("region", Tag.inserting(Component.text(region)))
755
+ .tag("generator", Tag.inserting(Component.text(generator)))
756
+ .build()
732
757
  );
758
+ TagResolver resolver = TagResolver.builder()
759
+ .tag("hover_info", Tag.inserting(tooltip))
760
+ .tag("command_tp", Tag.preProcessParsed("/plot area tp " + name))
761
+ .tag("command_info", Tag.preProcessParsed("/plot area info " + name))
762
+ .tag("number", Tag.inserting(Component.text(i)))
763
+ .tag("area_name", Tag.inserting(Component.text(name)))
764
+ .tag("area_type", Tag.inserting(Component.text(area.getType().name())))
765
+ .tag("area_terrain", Tag.inserting(Component.text(area.getTerrain().name())))
766
+ .build();
767
+ caption.set(TranslatableCaption.of("info.area_list_item"));
768
+ caption.setTagResolvers(resolver);
733
769
  }
734
770
  }, "/plot area list", TranslatableCaption.of("list.area_list_header_paged"));
735
771
  return true;
@@ -738,7 +774,10 @@ public class Area extends SubCommand {
738
774
  if (!player.hasPermission(Permission.PERMISSION_AREA_REGEN)) {
739
775
  player.sendMessage(
740
776
  TranslatableCaption.of("permission.no_permission"),
741
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_REGEN))
777
+ TagResolver.resolver(
778
+ "node",
779
+ Tag.inserting(Permission.PERMISSION_AREA_REGEN)
780
+ )
742
781
  );
743
782
  return false;
744
783
  }
@@ -750,13 +789,12 @@ public class Area extends SubCommand {
750
789
  if (area.getType() != PlotAreaType.PARTIAL) {
751
790
  player.sendMessage(
752
791
  TranslatableCaption.of("single.delete_world_region"),
753
- Template.of("world", area.getWorldName())
792
+ TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
754
793
  );
755
794
  return false;
756
795
  }
757
796
  QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
758
- queue.setChunkConsumer(chunk -> AugmentedUtils.generate(
759
- null,
797
+ queue.setChunkConsumer(chunk -> AugmentedUtils.generateChunk(
760
798
  area.getWorldName(),
761
799
  chunk.getX(),
762
800
  chunk.getZ(),
@@ -771,20 +809,23 @@ public class Area extends SubCommand {
771
809
  if (!player.hasPermission(Permission.PERMISSION_AREA_TP)) {
772
810
  player.sendMessage(
773
811
  TranslatableCaption.of("permission.no_permission"),
774
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_TP))
812
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_AREA_TP))
775
813
  );
776
814
  return false;
777
815
  }
778
816
  if (args.length != 2) {
779
817
  player.sendMessage(
780
818
  TranslatableCaption.of("commandconfig.command_syntax"),
781
- Template.of("value", "/plot area tp [area]")
819
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot area tp [area]")))
782
820
  );
783
821
  return false;
784
822
  }
785
823
  PlotArea area = this.plotAreaManager.getPlotAreaByString(args[1]);
786
824
  if (area == null) {
787
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"), Template.of("value", args[1]));
825
+ player.sendMessage(
826
+ TranslatableCaption.of("errors.not_valid_plot_world"),
827
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
828
+ );
788
829
  return false;
789
830
  }
790
831
  Location center;
Core/src/main/java/com/plotsquared/core/command/Auto.java CHANGED
@@ -35,6 +35,7 @@ import com.plotsquared.core.player.PlotPlayer;
35
35
  import com.plotsquared.core.plot.Plot;
36
36
  import com.plotsquared.core.plot.PlotArea;
37
37
  import com.plotsquared.core.plot.world.PlotAreaManager;
38
+ import com.plotsquared.core.services.plots.AutoQuery;
38
39
  import com.plotsquared.core.services.plots.AutoService;
39
40
  import com.plotsquared.core.util.EconHandler;
40
41
  import com.plotsquared.core.util.EventDispatcher;
@@ -43,7 +44,9 @@ import com.plotsquared.core.util.task.AutoClaimFinishTask;
43
44
  import com.plotsquared.core.util.task.RunnableVal;
44
45
  import com.plotsquared.core.util.task.TaskManager;
45
46
  import io.leangen.geantyref.TypeToken;
46
- import net.kyori.adventure.text.minimessage.Template;
47
+ import net.kyori.adventure.text.Component;
48
+ import net.kyori.adventure.text.minimessage.tag.Tag;
49
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
47
50
  import org.checkerframework.checker.nullness.qual.NonNull;
48
51
  import org.checkerframework.checker.nullness.qual.Nullable;
49
52
 
@@ -109,13 +112,13 @@ public class Auto extends SubCommand {
109
112
  if (diff < 0 && grantedPlots < sizeX * sizeZ) {
110
113
  player.sendMessage(
111
114
  TranslatableCaption.of("permission.cant_claim_more_plots"),
112
- Template.of("amount", String.valueOf(diff + grantedPlots))
115
+ TagResolver.resolver("amount", Tag.inserting(Component.text(diff + grantedPlots)))
113
116
  );
114
117
  return false;
115
118
  } else if (diff >= 0 && grantedPlots + diff < sizeX * sizeZ) {
116
119
  player.sendMessage(
117
120
  TranslatableCaption.of("permission.cant_claim_more_plots"),
118
- Template.of("amount", String.valueOf(diff + grantedPlots))
121
+ TagResolver.resolver("amount", Tag.inserting(Component.text(diff + grantedPlots)))
119
122
  );
120
123
  return false;
121
124
  } else {
@@ -127,15 +130,16 @@ public class Auto extends SubCommand {
127
130
  }
128
131
  player.sendMessage(
129
132
  TranslatableCaption.of("economy.removed_granted_plot"),
130
- Template.of("usedGrants", String.valueOf(grantedPlots - left)),
131
- Template.of("remainingGrants", String.valueOf(left))
133
+ TagResolver.builder()
134
+ .tag("usedGrants", Tag.inserting(Component.text(grantedPlots - left)))
135
+ .tag("remainingGrants", Tag.inserting(Component.text(left)))
136
+ .build()
132
137
  );
133
138
  }
134
139
  } else {
135
140
  player.sendMessage(
136
141
  TranslatableCaption.of("permission.cant_claim_more_plots"),
137
- Template.of("amount", String.valueOf(player.getAllowedPlots())
138
- )
142
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
139
143
  );
140
144
  return false;
141
145
  }
@@ -214,7 +218,7 @@ public class Auto extends SubCommand {
214
218
  } else {
215
219
  player.sendMessage(
216
220
  TranslatableCaption.of("commandconfig.command_syntax"),
217
- Template.of("value", getUsage())
221
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
218
222
  );
219
223
  return true;
220
224
  }
@@ -237,7 +241,7 @@ public class Auto extends SubCommand {
237
241
  if (event.getEventResult() == Result.DENY) {
238
242
  player.sendMessage(
239
243
  TranslatableCaption.of("events.event_denied"),
240
- Template.of("value", "Auto claim")
244
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto claim")))
241
245
  );
242
246
  return true;
243
247
  }
@@ -248,14 +252,14 @@ public class Auto extends SubCommand {
248
252
  if (!force && mega && !player.hasPermission(Permission.PERMISSION_AUTO_MEGA)) {
249
253
  player.sendMessage(
250
254
  TranslatableCaption.of("permission.no_permission"),
251
- Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
255
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_AUTO_MEGA))
252
256
  );
253
257
  return false;
254
258
  }
255
259
  if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
256
260
  player.sendMessage(
257
261
  TranslatableCaption.of("permission.cant_claim_more_plots_num"),
258
- Template.of("amount", String.valueOf(Settings.Claim.MAX_AUTO_AREA))
262
+ TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Claim.MAX_AUTO_AREA)))
259
263
  );
260
264
  return false;
261
265
  }
@@ -273,8 +277,10 @@ public class Auto extends SubCommand {
273
277
  if (!plotarea.hasSchematic(schematic)) {
274
278
  player.sendMessage(
275
279
  TranslatableCaption.of("schematics.schematic_invalid_named"),
276
- Template.of("schemname", schematic),
277
- Template.of("reason", "non-existent")
280
+ TagResolver.builder()
281
+ .tag("schemname", Tag.inserting(Component.text(schematic)))
282
+ .tag("reason", Tag.inserting(Component.text("non-existent")))
283
+ .build()
278
284
  );
279
285
  return true;
280
286
  }
@@ -283,17 +289,20 @@ public class Auto extends SubCommand {
283
289
  ) && !player.hasPermission("plots.admin.command.schematic")) {
284
290
  player.sendMessage(
285
291
  TranslatableCaption.of("permission.no_permission"),
286
- Template.of("node", "plots.claim.%s0")
292
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.claim.%s0")))
287
293
  );
288
294
  return true;
289
295
  }
290
296
  }
291
297
  if (this.econHandler != null && plotarea.useEconomy()) {
292
298
  PlotExpression costExp = plotarea.getPrices().get("claim");
299
+ PlotExpression mergeCostExp = plotarea.getPrices().get("merge");
300
+ int size = sizeX * sizeZ;
301
+ double mergeCost = size > 1 && mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
293
302
  double cost = costExp.evaluate(Settings.Limit.GLOBAL ?
294
303
  player.getPlotCount() :
295
304
  player.getPlotCount(plotarea.getWorldName()));
296
- cost = (sizeX * sizeZ) * cost;
305
+ cost = size * cost + mergeCost;
297
306
  if (cost > 0d) {
298
307
  if (!this.econHandler.isSupported()) {
299
308
  player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));
@@ -302,21 +311,26 @@ public class Auto extends SubCommand {
302
311
  if (!force && this.econHandler.getMoney(player) < cost) {
303
312
  player.sendMessage(
304
313
  TranslatableCaption.of("economy.cannot_afford_plot"),
305
- Template.of("money", this.econHandler.format(cost)),
306
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
314
+ TagResolver.builder()
315
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
316
+ .tag(
317
+ "balance",
318
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
319
+ )
320
+ .build()
307
321
  );
308
322
  return false;
309
323
  }
310
324
  this.econHandler.withdrawMoney(player, cost);
311
325
  player.sendMessage(
312
326
  TranslatableCaption.of("economy.removed_balance"),
313
- Template.of("money", this.econHandler.format(cost))
327
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
314
328
  );
315
329
  }
316
330
  }
317
331
 
318
332
  List<Plot> plots = this.servicePipeline
319
- .pump(new AutoService.AutoQuery(player, null, sizeX, sizeZ, plotarea))
333
+ .pump(new AutoQuery(player, null, sizeX, sizeZ, plotarea))
320
334
  .through(AutoService.class)
321
335
  .getResult();
322
336
 
@@ -344,7 +358,7 @@ public class Auto extends SubCommand {
344
358
  if (!force && mergeEvent.getEventResult() == Result.DENY) {
345
359
  player.sendMessage(
346
360
  TranslatableCaption.of("events.event_denied"),
347
- Template.of("value", "Auto merge")
361
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge")))
348
362
  );
349
363
  return false;
350
364
  }
Core/src/main/java/com/plotsquared/core/command/Backup.java CHANGED
@@ -29,7 +29,9 @@ import com.plotsquared.core.player.PlotPlayer;
29
29
  import com.plotsquared.core.plot.Plot;
30
30
  import com.plotsquared.core.util.task.RunnableVal2;
31
31
  import com.plotsquared.core.util.task.RunnableVal3;
32
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.minimessage.tag.Tag;
34
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
33
35
  import org.checkerframework.checker.nullness.qual.NonNull;
34
36
 
35
37
  import java.nio.file.Files;
@@ -66,7 +68,7 @@ public final class Backup extends Command {
66
68
  private static boolean sendMessage(PlotPlayer<?> player) {
67
69
  player.sendMessage(
68
70
  TranslatableCaption.of("commandconfig.command_syntax"),
69
- Template.of("value", "/plot backup <save | list | load>")
71
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot backup <save | list | load>")))
70
72
  );
71
73
  return true;
72
74
  }
@@ -134,33 +136,44 @@ public final class Backup extends Command {
134
136
  } else if (!plot.hasOwner()) {
135
137
  player.sendMessage(
136
138
  TranslatableCaption.of("backups.backup_impossible"),
137
- Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
139
+ TagResolver.resolver("plot", Tag.inserting(
140
+ TranslatableCaption.of("generic.generic_unowned").toComponent(player)
141
+ ))
138
142
  );
139
143
  } else if (plot.getVolume() > Integer.MAX_VALUE) {
140
144
  player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
141
145
  } else if (plot.isMerged()) {
142
146
  player.sendMessage(
143
147
  TranslatableCaption.of("backups.backup_impossible"),
144
- Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
148
+ TagResolver.resolver("plot", Tag.inserting(
149
+ TranslatableCaption.of("generic.generic_merged").toComponent(player)
150
+ ))
145
151
  );
146
152
  } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
147
153
  player.sendMessage(
148
154
  TranslatableCaption.of("permission.no_permission"),
149
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
155
+ TagResolver.resolver(
156
+ "node",
157
+ Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
158
+ )
150
159
  );
151
160
  } else {
152
161
  final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
153
162
  if (backupProfile instanceof NullBackupProfile) {
154
163
  player.sendMessage(
155
164
  TranslatableCaption.of("backups.backup_impossible"),
156
- Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
165
+ TagResolver.resolver(
166
+ "plot", Tag.inserting(TranslatableCaption
167
+ .of("generic.generic_other")
168
+ .toComponent(player))
169
+ )
157
170
  );
158
171
  } else {
159
172
  backupProfile.createBackup().whenComplete((backup, throwable) -> {
160
173
  if (throwable != null) {
161
174
  player.sendMessage(
162
175
  TranslatableCaption.of("backups.backup_save_failed"),
163
- Template.of("reason", throwable.getMessage())
176
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
164
177
  );
165
178
  throwable.printStackTrace();
166
179
  } else {
@@ -187,49 +200,64 @@ public final class Backup extends Command {
187
200
  } else if (!plot.hasOwner()) {
188
201
  player.sendMessage(
189
202
  TranslatableCaption.of("backups.backup_impossible"),
190
- Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
203
+ TagResolver.resolver("plot", Tag.inserting(
204
+ TranslatableCaption.of("generic.generic_unowned").toComponent(player)
205
+ ))
191
206
  );
192
207
  } else if (plot.isMerged()) {
193
208
  player.sendMessage(
194
209
  TranslatableCaption.of("backups.backup_impossible"),
195
- Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
210
+ TagResolver.resolver("plot", Tag.inserting(
211
+ TranslatableCaption.of("generic.generic_merged").toComponent(player)
212
+ ))
196
213
  );
197
214
  } else if (plot.getVolume() > Integer.MAX_VALUE) {
198
215
  player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
199
216
  } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
200
217
  player.sendMessage(
201
218
  TranslatableCaption.of("permission.no_permission"),
202
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
219
+ TagResolver.resolver(
220
+ "node",
221
+ Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
222
+ )
203
223
  );
204
224
  } else {
205
225
  final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
206
226
  if (backupProfile instanceof NullBackupProfile) {
207
227
  player.sendMessage(
208
228
  TranslatableCaption.of("backups.backup_impossible"),
209
- Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
229
+ TagResolver.resolver("plot", Tag.inserting(
230
+ TranslatableCaption.of("generic.generic_other").toComponent(player)
231
+ ))
210
232
  );
211
233
  } else {
212
234
  backupProfile.listBackups().whenComplete((backups, throwable) -> {
213
235
  if (throwable != null) {
214
236
  player.sendMessage(
215
237
  TranslatableCaption.of("backups.backup_list_failed"),
216
- Template.of("reason", throwable.getMessage())
238
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
217
239
  );
218
240
  throwable.printStackTrace();
219
241
  } else {
220
242
  player.sendMessage(
221
243
  TranslatableCaption.of("backups.backup_list_header"),
222
- Template.of("plot", plot.getId().toCommaSeparatedString())
244
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toCommaSeparatedString())))
223
245
  );
224
246
  try {
225
247
  for (int i = 0; i < backups.size(); i++) {
226
248
  player.sendMessage(
227
249
  TranslatableCaption.of("backups.backup_list_entry"),
228
- Template.of("number", Integer.toString(i + 1)),
229
- Template.of("value", DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.ofInstant(
230
- Instant.ofEpochMilli(backups.get(i).getCreationTime()),
231
- ZoneId.systemDefault()
232
- )))
250
+ TagResolver.builder()
251
+ .tag("number", Tag.inserting(Component.text(i + 1)))
252
+ .tag(
253
+ "value",
254
+ Tag.inserting(Component.text(DateTimeFormatter.RFC_1123_DATE_TIME.format(
255
+ ZonedDateTime.ofInstant(
256
+ Instant.ofEpochMilli(backups.get(i).getCreationTime()),
257
+ ZoneId.systemDefault()
258
+ ))))
259
+ )
260
+ .build()
233
261
  );
234
262
  }
235
263
  } catch (final Exception e) {
@@ -257,24 +285,31 @@ public final class Backup extends Command {
257
285
  } else if (!plot.hasOwner()) {
258
286
  player.sendMessage(
259
287
  TranslatableCaption.of("backups.backup_impossible"),
260
- Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
288
+ TagResolver.resolver("plot", Tag.inserting(
289
+ TranslatableCaption.of("generic.generic_unowned").toComponent(player)
290
+ ))
261
291
  );
262
292
  } else if (plot.isMerged()) {
263
293
  player.sendMessage(
264
294
  TranslatableCaption.of("backups.backup_impossible"),
265
- Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
295
+ TagResolver.resolver("plot", Tag.inserting(
296
+ TranslatableCaption.of("generic.generic_merged").toComponent(player)
297
+ ))
266
298
  );
267
299
  } else if (plot.getVolume() > Integer.MAX_VALUE) {
268
300
  player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
269
301
  } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
270
302
  player.sendMessage(
271
303
  TranslatableCaption.of("permission.no_permission"),
272
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
304
+ TagResolver.resolver(
305
+ "node",
306
+ Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
307
+ )
273
308
  );
274
309
  } else if (args.length == 0) {
275
310
  player.sendMessage(
276
311
  TranslatableCaption.of("commandconfig.command_syntax"),
277
- Template.of("value", "Usage: /plot backup save/list/load")
312
+ TagResolver.resolver("value", Tag.inserting(Component.text("Usage: /plot backup save/list/load")))
278
313
  );
279
314
  } else {
280
315
  final int number;
@@ -283,7 +318,7 @@ public final class Backup extends Command {
283
318
  } catch (final Exception e) {
284
319
  player.sendMessage(
285
320
  TranslatableCaption.of("invalid.not_a_number"),
286
- Template.of("value", args[0])
321
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
287
322
  );
288
323
  return;
289
324
  }
@@ -291,23 +326,27 @@ public final class Backup extends Command {
291
326
  if (backupProfile instanceof NullBackupProfile) {
292
327
  player.sendMessage(
293
328
  TranslatableCaption.of("backups.backup_impossible"),
294
- Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
329
+ TagResolver.resolver("plot", Tag.inserting(
330
+ TranslatableCaption.of("generic.generic_other").toComponent(player)
331
+ ))
295
332
  );
296
333
  } else {
297
334
  backupProfile.listBackups().whenComplete((backups, throwable) -> {
298
335
  if (throwable != null) {
299
336
  player.sendMessage(
300
337
  TranslatableCaption.of("backups.backup_load_failure"),
301
- Template.of("reason", throwable.getMessage())
338
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
302
339
  );
303
340
  throwable.printStackTrace();
304
341
  } else {
305
342
  if (number < 1 || number > backups.size()) {
306
343
  player.sendMessage(
307
344
  TranslatableCaption.of("backups.backup_impossible"),
308
- Template.of(
345
+ TagResolver.resolver(
309
346
  "plot",
310
- TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
347
+ Tag.inserting(TranslatableCaption
348
+ .of("generic.generic_invalid_choice")
349
+ .toComponent(player))
311
350
  )
312
351
  );
313
352
  } else {
@@ -317,9 +356,11 @@ public final class Backup extends Command {
317
356
  .exists(backup.getFile())) {
318
357
  player.sendMessage(
319
358
  TranslatableCaption.of("backups.backup_impossible"),
320
- Template.of(
359
+ TagResolver.resolver(
321
360
  "plot",
322
- TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
361
+ Tag.inserting(TranslatableCaption
362
+ .of("generic.generic_invalid_choice")
363
+ .toComponent(player))
323
364
  )
324
365
  );
325
366
  } else {
@@ -329,7 +370,10 @@ public final class Backup extends Command {
329
370
  if (error != null) {
330
371
  player.sendMessage(
331
372
  TranslatableCaption.of("backups.backup_load_failure"),
332
- Template.of("reason", error.getMessage())
373
+ TagResolver.resolver(
374
+ "reason",
375
+ Tag.inserting(Component.text(error.getMessage()))
376
+ )
333
377
  );
334
378
  } else {
335
379
  player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));
Core/src/main/java/com/plotsquared/core/command/Biome.java CHANGED
@@ -18,6 +18,7 @@
18
18
  */
19
19
  package com.plotsquared.core.command;
20
20
 
21
+ import com.plotsquared.core.configuration.caption.StaticCaption;
21
22
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
22
23
  import com.plotsquared.core.player.PlotPlayer;
23
24
  import com.plotsquared.core.plot.Plot;
@@ -25,7 +26,9 @@ import com.plotsquared.core.util.StringMan;
25
26
  import com.sk89q.worldedit.command.util.SuggestionHelper;
26
27
  import com.sk89q.worldedit.world.biome.BiomeType;
27
28
  import com.sk89q.worldedit.world.biome.BiomeTypes;
28
- import net.kyori.adventure.text.minimessage.Template;
29
+ import net.kyori.adventure.text.Component;
30
+ import net.kyori.adventure.text.minimessage.tag.Tag;
31
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
29
32
 
30
33
  import java.util.Collection;
31
34
  import java.util.Locale;
@@ -47,16 +50,13 @@ public class Biome extends SetCommand {
47
50
  } catch (final Exception ignore) {
48
51
  }
49
52
  if (biome == null) {
50
- String biomes = StringMan.join(
51
- BiomeType.REGISTRY.values(),
52
- MINI_MESSAGE.serialize(MINI_MESSAGE.parse(TranslatableCaption
53
- .of("blocklist.block_list_separator")
54
- .getComponent(player)))
55
- );
53
+ String separator = TranslatableCaption.of("blocklist.block_list_separator").getComponent(player);
56
54
  player.sendMessage(TranslatableCaption.of("biome.need_biome"));
57
55
  player.sendMessage(
58
- TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
59
- Template.of("values", biomes)
56
+ StaticCaption.of(
57
+ TranslatableCaption.of("commandconfig.subcommand_set_options_header_only").getComponent(player)
58
+ + StringMan.join(BiomeType.REGISTRY.values(), separator)
59
+ )
60
60
  );
61
61
  return false;
62
62
  }
@@ -73,7 +73,7 @@ public class Biome extends SetCommand {
73
73
  plot.removeRunning();
74
74
  player.sendMessage(
75
75
  TranslatableCaption.of("biome.biome_set_to"),
76
- Template.of("value", value.toLowerCase())
76
+ TagResolver.resolver("value", Tag.inserting(Component.text(value.toLowerCase())))
77
77
  );
78
78
  });
79
79
  return true;
Core/src/main/java/com/plotsquared/core/command/Buy.java CHANGED
@@ -32,7 +32,9 @@ import com.plotsquared.core.util.EconHandler;
32
32
  import com.plotsquared.core.util.EventDispatcher;
33
33
  import com.plotsquared.core.util.task.RunnableVal2;
34
34
  import com.plotsquared.core.util.task.RunnableVal3;
35
- import net.kyori.adventure.text.minimessage.Template;
35
+ import net.kyori.adventure.text.Component;
36
+ import net.kyori.adventure.text.minimessage.tag.Tag;
37
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
36
38
  import org.checkerframework.checker.nullness.qual.NonNull;
37
39
 
38
40
  import java.util.Set;
@@ -84,7 +86,7 @@ public class Buy extends Command {
84
86
  checkTrue(
85
87
  player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
86
88
  TranslatableCaption.of("permission.cant_claim_more_plots"),
87
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
89
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
88
90
  );
89
91
  double price = plot.getFlag(PriceFlag.class);
90
92
  if (price <= 0) {
@@ -97,8 +99,10 @@ public class Buy extends Command {
97
99
  checkTrue(
98
100
  this.econHandler.getMoney(player) >= price,
99
101
  TranslatableCaption.of("economy.cannot_afford_plot"),
100
- Template.of("money", this.econHandler.format(price)),
101
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
102
+ TagResolver.builder()
103
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
104
+ .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
105
+ .build()
102
106
  );
103
107
  this.econHandler.withdrawMoney(player, price);
104
108
  // Failure
@@ -106,7 +110,7 @@ public class Buy extends Command {
106
110
  confirm.run(this, () -> {
107
111
  player.sendMessage(
108
112
  TranslatableCaption.of("economy.removed_balance"),
109
- Template.of("money", this.econHandler.format(price))
113
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
110
114
  );
111
115
 
112
116
  this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
@@ -115,9 +119,11 @@ public class Buy extends Command {
115
119
  if (owner != null) {
116
120
  owner.sendMessage(
117
121
  TranslatableCaption.of("economy.plot_sold"),
118
- Template.of("plot", plot.getId().toString()),
119
- Template.of("player", player.getName()),
120
- Template.of("price", this.econHandler.format(price))
122
+ TagResolver.builder()
123
+ .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
124
+ .tag("player", Tag.inserting(Component.text(player.getName())))
125
+ .tag("price", Tag.inserting(Component.text(this.econHandler.format(price))))
126
+ .build()
121
127
  );
122
128
  }
123
129
  PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
@@ -129,7 +135,7 @@ public class Buy extends Command {
129
135
  plot.getPlotModificationManager().setSign(player.getName());
130
136
  player.sendMessage(
131
137
  TranslatableCaption.of("working.claimed"),
132
- Template.of("plot", plot.getId().toString())
138
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
133
139
  );
134
140
  whenDone.run(Buy.this, CommandResult.SUCCESS);
135
141
  }, () -> {
Core/src/main/java/com/plotsquared/core/command/Caps.java CHANGED
@@ -29,7 +29,10 @@ import com.plotsquared.core.plot.flag.implementations.HostileCapFlag;
29
29
  import com.plotsquared.core.plot.flag.implementations.MiscCapFlag;
30
30
  import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
31
31
  import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
32
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.ComponentLike;
34
+ import net.kyori.adventure.text.minimessage.tag.Tag;
35
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
33
36
 
34
37
  import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
35
38
  import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
@@ -53,7 +56,7 @@ public class Caps extends SubCommand {
53
56
  if (!plot.isAdded(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
54
57
  player.sendMessage(
55
58
  TranslatableCaption.of("permission.no_permission"),
56
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_CAPS_OTHER))
59
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_CAPS_OTHER))
57
60
  );
58
61
  return false;
59
62
  }
@@ -80,15 +83,17 @@ public class Caps extends SubCommand {
80
83
  final int current = countedEntities[type];
81
84
  final int max = plot.getFlag(capFlag);
82
85
  final String percentage = String.format("%.1f", 100 * ((float) current / max));
83
- String maxBeautified = max >= Integer.MAX_VALUE
84
- ? TranslatableCaption.of("info.infinite").getComponent(player)
85
- : String.valueOf(max);
86
+ ComponentLike maxBeautified = max >= Integer.MAX_VALUE
87
+ ? TranslatableCaption.of("info.infinite").toComponent(player)
88
+ : Component.text(max);
86
89
  player.sendMessage(
87
90
  TranslatableCaption.of("info.plot_caps_format"),
88
- Template.of("cap", name),
89
- Template.of("current", String.valueOf(current)),
90
- Template.of("limit", maxBeautified),
91
- Template.of("percentage", percentage)
91
+ TagResolver.builder()
92
+ .tag("cap", Tag.inserting(Component.text(name)))
93
+ .tag("current", Tag.inserting(Component.text(current)))
94
+ .tag("limit", Tag.inserting(maxBeautified))
95
+ .tag("percentage", Tag.inserting(Component.text(percentage)))
96
+ .build()
92
97
  );
93
98
  }
94
99
 
Core/src/main/java/com/plotsquared/core/command/Chat.java DELETED
@@ -1,54 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.core.command;
20
-
21
- import com.plotsquared.core.configuration.caption.TranslatableCaption;
22
- import com.plotsquared.core.player.PlotPlayer;
23
- import com.plotsquared.core.plot.PlotArea;
24
- import net.kyori.adventure.text.minimessage.Template;
25
-
26
- /**
27
- * @deprecated In favor of "/plot toggle chat" and
28
- * scheduled for removal within the next major release.
29
- */
30
- @Deprecated(forRemoval = true, since = "6.0.0")
31
- @CommandDeclaration(command = "chat",
32
- usage = "/plot chat",
33
- permission = "plots.chat",
34
- category = CommandCategory.CHAT,
35
- requiredType = RequiredType.PLAYER)
36
- public class Chat extends SubCommand {
37
-
38
- @Override
39
- public boolean onCommand(PlotPlayer<?> player, String[] args) {
40
- PlotArea area = player.getPlotAreaAbs();
41
- check(area, TranslatableCaption.of("errors.not_in_plot_world"));
42
- player.sendMessage(
43
- TranslatableCaption.of("errors.deprecated_commands"),
44
- Template.of("replacement", "/plot toggle chat")
45
- );
46
- if (player.getPlotAreaAbs().isForcingPlotChat()) {
47
- player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced"));
48
- return true;
49
- }
50
- MainCommand.getInstance().toggle.chat(this, player, args, null, null);
51
- return true;
52
- }
53
-
54
- }
Core/src/main/java/com/plotsquared/core/command/Claim.java CHANGED
@@ -37,7 +37,9 @@ import com.plotsquared.core.util.EconHandler;
37
37
  import com.plotsquared.core.util.EventDispatcher;
38
38
  import com.plotsquared.core.util.PlotExpression;
39
39
  import com.plotsquared.core.util.task.TaskManager;
40
- import net.kyori.adventure.text.minimessage.Template;
40
+ import net.kyori.adventure.text.Component;
41
+ import net.kyori.adventure.text.minimessage.tag.Tag;
42
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
41
43
  import org.apache.logging.log4j.LogManager;
42
44
  import org.apache.logging.log4j.Logger;
43
45
  import org.checkerframework.checker.nullness.qual.NonNull;
@@ -81,7 +83,7 @@ public class Claim extends SubCommand {
81
83
  if (event.getEventResult() == Result.DENY) {
82
84
  player.sendMessage(
83
85
  TranslatableCaption.of("events.event_denied"),
84
- Template.of("value", "Claim")
86
+ TagResolver.resolver("value", Tag.inserting(Component.text("Claim")))
85
87
  );
86
88
  return true;
87
89
  }
@@ -100,14 +102,14 @@ public class Claim extends SubCommand {
100
102
  if (grants <= 0) {
101
103
  player.sendMessage(
102
104
  TranslatableCaption.of("permission.cant_claim_more_plots"),
103
- Template.of("amount", String.valueOf(grants))
105
+ TagResolver.resolver("amount", Tag.inserting(Component.text(grants)))
104
106
  );
105
107
  metaDataAccess.remove();
106
108
  }
107
109
  } else {
108
110
  player.sendMessage(
109
111
  TranslatableCaption.of("permission.cant_claim_more_plots"),
110
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
112
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
111
113
  );
112
114
  return false;
113
115
  }
@@ -122,8 +124,10 @@ public class Claim extends SubCommand {
122
124
  if (!area.hasSchematic(schematic)) {
123
125
  player.sendMessage(
124
126
  TranslatableCaption.of("schematics.schematic_invalid_named"),
125
- Template.of("schemname", schematic),
126
- Template.of("reason", "non-existent")
127
+ TagResolver.builder()
128
+ .tag("schemname", Tag.inserting(Component.text(schematic)))
129
+ .tag("reason", Tag.inserting(Component.text("non-existent")))
130
+ .build()
127
131
  );
128
132
  }
129
133
  if (!player.hasPermission(Permission.PERMISSION_CLAIM_SCHEMATIC
@@ -132,7 +136,7 @@ public class Claim extends SubCommand {
132
136
  ) && !force) {
133
137
  player.sendMessage(
134
138
  TranslatableCaption.of("permission.no_schematic_permission"),
135
- Template.of("value", schematic)
139
+ TagResolver.resolver("value", Tag.inserting(Component.text(schematic)))
136
140
  );
137
141
  }
138
142
  }
@@ -148,16 +152,28 @@ public class Claim extends SubCommand {
148
152
  if (this.econHandler.getMoney(player) < cost) {
149
153
  player.sendMessage(
150
154
  TranslatableCaption.of("economy.cannot_afford_plot"),
151
- Template.of("money", this.econHandler.format(cost)),
152
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
155
+ TagResolver.builder()
156
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
157
+ .tag(
158
+ "balance",
159
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
160
+ player))))
161
+ )
162
+ .build()
153
163
  );
154
164
  return false;
155
165
  }
156
166
  this.econHandler.withdrawMoney(player, cost);
157
167
  player.sendMessage(
158
168
  TranslatableCaption.of("economy.removed_balance"),
159
- Template.of("money", this.econHandler.format(cost)),
160
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
169
+ TagResolver.builder()
170
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
171
+ .tag(
172
+ "balance",
173
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
174
+ player))))
175
+ )
176
+ .build()
161
177
  );
162
178
  }
163
179
  }
@@ -169,8 +185,10 @@ public class Claim extends SubCommand {
169
185
  }
170
186
  player.sendMessage(
171
187
  TranslatableCaption.of("economy.removed_granted_plot"),
172
- Template.of("usedGrants", String.valueOf((grants - 1))),
173
- Template.of("remainingGrants", String.valueOf(grants))
188
+ TagResolver.builder()
189
+ .tag("usedGrants", Tag.inserting(Component.text(grants - 1)))
190
+ .tag("remainingGrants", Tag.inserting(Component.text(grants)))
191
+ .build()
174
192
  );
175
193
  }
176
194
  }
@@ -196,7 +214,7 @@ public class Claim extends SubCommand {
196
214
  if (mergeEvent.getEventResult() == Result.DENY) {
197
215
  player.sendMessage(
198
216
  TranslatableCaption.of("events.event_denied"),
199
- Template.of("value", "Auto merge on claim")
217
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge on claim")))
200
218
  );
201
219
  } else {
202
220
  if (plot.getPlotModificationManager().autoMerge(
Core/src/main/java/com/plotsquared/core/command/Clear.java CHANGED
@@ -35,7 +35,9 @@ import com.plotsquared.core.util.EventDispatcher;
35
35
  import com.plotsquared.core.util.task.RunnableVal2;
36
36
  import com.plotsquared.core.util.task.RunnableVal3;
37
37
  import com.plotsquared.core.util.task.TaskManager;
38
- import net.kyori.adventure.text.minimessage.Template;
38
+ import net.kyori.adventure.text.Component;
39
+ import net.kyori.adventure.text.minimessage.tag.Tag;
40
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
39
41
  import org.checkerframework.checker.nullness.qual.NonNull;
40
42
 
41
43
  import java.util.concurrent.CompletableFuture;
@@ -78,7 +80,7 @@ public class Clear extends Command {
78
80
  if (eventResult == Result.DENY) {
79
81
  player.sendMessage(
80
82
  TranslatableCaption.of("events.event_denied"),
81
- Template.of("value", "Clear")
83
+ TagResolver.resolver("value", Tag.inserting(Component.text("Clear")))
82
84
  );
83
85
  return CompletableFuture.completedFuture(true);
84
86
  }
@@ -105,35 +107,35 @@ public class Clear extends Command {
105
107
  }
106
108
  BackupManager.backup(player, plot, () -> {
107
109
  final long start = System.currentTimeMillis();
108
- boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
109
- TaskManager.runTask(() -> {
110
- plot.removeRunning();
111
- // If the state changes, then mark it as no longer done
112
- if (DoneFlag.isDone(plot)) {
113
- PlotFlag<?, ?> plotFlag =
114
- plot.getFlagContainer().getFlag(DoneFlag.class);
115
- PlotFlagRemoveEvent event = this.eventDispatcher
116
- .callFlagRemove(plotFlag, plot);
117
- if (event.getEventResult() != Result.DENY) {
118
- plot.removeFlag(event.getFlag());
119
- }
110
+ boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> TaskManager.runTask(() -> {
111
+ plot.removeRunning();
112
+ // If the state changes, then mark it as no longer done
113
+ if (DoneFlag.isDone(plot)) {
114
+ PlotFlag<?, ?> plotFlag =
115
+ plot.getFlagContainer().getFlag(DoneFlag.class);
116
+ PlotFlagRemoveEvent event = this.eventDispatcher
117
+ .callFlagRemove(plotFlag, plot);
118
+ if (event.getEventResult() != Result.DENY) {
119
+ plot.removeFlag(event.getFlag());
120
120
  }
121
- if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
122
- PlotFlag<?, ?> plotFlag =
123
- plot.getFlagContainer().getFlag(AnalysisFlag.class);
124
- PlotFlagRemoveEvent event = this.eventDispatcher
125
- .callFlagRemove(plotFlag, plot);
126
- if (event.getEventResult() != Result.DENY) {
127
- plot.removeFlag(event.getFlag());
128
- }
121
+ }
122
+ if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
123
+ PlotFlag<?, ?> plotFlag =
124
+ plot.getFlagContainer().getFlag(AnalysisFlag.class);
125
+ PlotFlagRemoveEvent event = this.eventDispatcher
126
+ .callFlagRemove(plotFlag, plot);
127
+ if (event.getEventResult() != Result.DENY) {
128
+ plot.removeFlag(event.getFlag());
129
129
  }
130
- player.sendMessage(
131
- TranslatableCaption.of("working.clearing_done"),
132
- Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
133
- Template.of("plot", plot.getId().toString())
134
- );
135
- });
136
- });
130
+ }
131
+ player.sendMessage(
132
+ TranslatableCaption.of("working.clearing_done"),
133
+ TagResolver.builder()
134
+ .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
135
+ .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
136
+ .build()
137
+ );
138
+ }));
137
139
  if (!result) {
138
140
  player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
139
141
  } else {
Core/src/main/java/com/plotsquared/core/command/Cluster.java CHANGED
@@ -32,19 +32,26 @@ import com.plotsquared.core.plot.Plot;
32
32
  import com.plotsquared.core.plot.PlotArea;
33
33
  import com.plotsquared.core.plot.PlotCluster;
34
34
  import com.plotsquared.core.plot.PlotId;
35
+ import com.plotsquared.core.util.ComponentHelper;
35
36
  import com.plotsquared.core.util.TabCompletions;
36
37
  import com.plotsquared.core.util.query.PlotQuery;
37
- import net.kyori.adventure.text.minimessage.Template;
38
+ import net.kyori.adventure.text.Component;
39
+ import net.kyori.adventure.text.format.NamedTextColor;
40
+ import net.kyori.adventure.text.format.Style;
41
+ import net.kyori.adventure.text.minimessage.tag.Tag;
42
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
38
43
 
39
44
  import java.util.Collection;
40
45
  import java.util.Collections;
41
46
  import java.util.HashSet;
42
47
  import java.util.LinkedList;
43
48
  import java.util.List;
49
+ import java.util.Objects;
44
50
  import java.util.Set;
45
51
  import java.util.UUID;
46
52
  import java.util.concurrent.TimeoutException;
47
53
  import java.util.stream.Collectors;
54
+ import java.util.stream.Stream;
48
55
 
49
56
  @CommandDeclaration(command = "cluster",
50
57
  aliases = "clusters",
@@ -53,36 +60,39 @@ import java.util.stream.Collectors;
53
60
  permission = "plots.cluster")
54
61
  public class Cluster extends SubCommand {
55
62
 
63
+ private static final Component[] AVAILABLE_ARGS = Stream.of(
64
+ "list", "create", "delete", "resize", "invite", "kick", "leave", "helpers", "tp", "sethome"
65
+ ).map(s -> Component.text(s).style(Style.style(NamedTextColor.DARK_AQUA))).toArray(Component[]::new);
66
+ private static final Component SEPARATOR = Component.text(", ").style(Style.style(NamedTextColor.GRAY));
67
+
68
+ // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
56
69
  @Override
57
70
  public boolean onCommand(PlotPlayer<?> player, String[] args) {
58
-
59
- // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
60
71
  if (args.length == 0) {
61
72
  // return arguments
62
73
  player.sendMessage(
63
74
  TranslatableCaption.of("cluster.cluster_available_args"),
64
- Template.of(
65
- "list",
66
- "<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>"
67
- )
75
+ TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
68
76
  );
69
77
  return false;
70
78
  }
71
79
  String sub = args[0].toLowerCase();
72
80
  switch (sub) {
73
- case "l":
74
- case "list": {
81
+ case "l", "list" -> {
75
82
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) {
76
83
  player.sendMessage(
77
84
  TranslatableCaption.of("permission.no_permission"),
78
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_LIST))
85
+ TagResolver.resolver(
86
+ "node",
87
+ Tag.inserting(Permission.PERMISSION_CLUSTER_LIST)
88
+ )
79
89
  );
80
90
  return false;
81
91
  }
82
92
  if (args.length != 1) {
83
93
  player.sendMessage(
84
94
  TranslatableCaption.of("commandconfig.command_syntax"),
85
- Template.of("value", "/plot cluster list")
95
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster list")))
86
96
  );
87
97
  return false;
88
98
  }
@@ -94,7 +104,7 @@ public class Cluster extends SubCommand {
94
104
  Set<PlotCluster> clusters = area.getClusters();
95
105
  player.sendMessage(
96
106
  TranslatableCaption.of("cluster.cluster_list_heading"),
97
- Template.of("amount", clusters.size() + "")
107
+ TagResolver.resolver("amount", Tag.inserting(Component.text(clusters.size())))
98
108
  );
99
109
  for (PlotCluster cluster : clusters) {
100
110
  // Ignore unmanaged clusters
@@ -102,33 +112,35 @@ public class Cluster extends SubCommand {
102
112
  if (player.getUUID().equals(cluster.owner)) {
103
113
  player.sendMessage(
104
114
  TranslatableCaption.of("cluster.cluster_list_element_owner"),
105
- Template.of("cluster", name)
115
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
106
116
  );
107
117
  } else if (cluster.helpers.contains(player.getUUID())) {
108
118
  player.sendMessage(
109
119
  TranslatableCaption.of("cluster.cluster_list_element_helpers"),
110
- Template.of("cluster", name)
120
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
111
121
  );
112
122
  } else if (cluster.invited.contains(player.getUUID())) {
113
123
  player.sendMessage(
114
124
  TranslatableCaption.of("cluster.cluster_list_element_invited"),
115
- Template.of("cluster", name)
125
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
116
126
  );
117
127
  } else {
118
128
  player.sendMessage(
119
129
  TranslatableCaption.of("cluster.cluster_list_element"),
120
- Template.of("cluster", cluster.toString())
130
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.toString())))
121
131
  );
122
132
  }
123
133
  }
124
134
  return true;
125
135
  }
126
- case "c":
127
- case "create": {
136
+ case "c", "create" -> {
128
137
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) {
129
138
  player.sendMessage(
130
139
  TranslatableCaption.of("permission.no_permission"),
131
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE))
140
+ TagResolver.resolver(
141
+ "node",
142
+ Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE)
143
+ )
132
144
  );
133
145
  return false;
134
146
  }
@@ -140,7 +152,10 @@ public class Cluster extends SubCommand {
140
152
  if (args.length != 4) {
141
153
  player.sendMessage(
142
154
  TranslatableCaption.of("commandconfig.command_syntax"),
143
- Template.of("value", "/plot cluster create <name> <id-bot> <id-top>")
155
+ TagResolver.resolver(
156
+ "value",
157
+ Tag.inserting(Component.text("/plot cluster create <name> <id-bot> <id-top>"))
158
+ )
144
159
  );
145
160
  return false;
146
161
  }
@@ -150,7 +165,7 @@ public class Cluster extends SubCommand {
150
165
  if (currentClusters >= player.getAllowedPlots()) {
151
166
  player.sendMessage(
152
167
  TranslatableCaption.of("permission.cant_claim_more_clusters"),
153
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
168
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
154
169
  );
155
170
  }
156
171
  PlotId pos1;
@@ -168,7 +183,7 @@ public class Cluster extends SubCommand {
168
183
  if (area.getCluster(name) != null) {
169
184
  player.sendMessage(
170
185
  TranslatableCaption.of("alias.alias_is_taken"),
171
- Template.of("alias", name)
186
+ TagResolver.resolver("alias", Tag.inserting(Component.text(name)))
172
187
  );
173
188
  return false;
174
189
  }
@@ -182,7 +197,7 @@ public class Cluster extends SubCommand {
182
197
  if (cluster != null) {
183
198
  player.sendMessage(
184
199
  TranslatableCaption.of("cluster.cluster_intersection"),
185
- Template.of("cluster", cluster.getName())
200
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
186
201
  );
187
202
  return false;
188
203
  }
@@ -190,7 +205,7 @@ public class Cluster extends SubCommand {
190
205
  if (!area.contains(pos1) || !area.contains(pos2)) {
191
206
  player.sendMessage(
192
207
  TranslatableCaption.of("cluster.cluster_outside"),
193
- Template.of("area", String.valueOf(area))
208
+ TagResolver.resolver("area", Tag.inserting(Component.text(area.toString())))
194
209
  );
195
210
  return false;
196
211
  }
@@ -202,7 +217,10 @@ public class Cluster extends SubCommand {
202
217
  if (!plot.isOwner(uuid)) {
203
218
  player.sendMessage(
204
219
  TranslatableCaption.of("permission.no_permission"),
205
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE_OTHER))
220
+ TagResolver.resolver(
221
+ "node",
222
+ Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE_OTHER)
223
+ )
206
224
  );
207
225
  return false;
208
226
  }
@@ -224,7 +242,10 @@ public class Cluster extends SubCommand {
224
242
  if (current + cluster.getArea() > allowed) {
225
243
  player.sendMessage(
226
244
  TranslatableCaption.of("permission.no_permission"),
227
- Template.of("node", Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()))
245
+ TagResolver.resolver(
246
+ "node",
247
+ Tag.inserting(Component.text(Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea())))
248
+ )
228
249
  );
229
250
  return false;
230
251
  }
@@ -243,24 +264,25 @@ public class Cluster extends SubCommand {
243
264
  }
244
265
  player.sendMessage(
245
266
  TranslatableCaption.of("cluster.cluster_created"),
246
- Template.of("name", name)
267
+ TagResolver.resolver("name", Tag.inserting(Component.text(name)))
247
268
  );
248
269
  return true;
249
270
  }
250
- case "disband":
251
- case "del":
252
- case "delete": {
271
+ case "disband", "del", "delete" -> {
253
272
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) {
254
273
  player.sendMessage(
255
274
  TranslatableCaption.of("permission.no_permission"),
256
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE))
275
+ TagResolver.resolver(
276
+ "node",
277
+ Tag.inserting(Permission.PERMISSION_CLUSTER_DELETE)
278
+ )
257
279
  );
258
280
  return false;
259
281
  }
260
282
  if (args.length != 1 && args.length != 2) {
261
283
  player.sendMessage(
262
284
  TranslatableCaption.of("commandconfig.command_syntax"),
263
- Template.of("value", "/plot cluster delete [name]")
285
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster delete [name]")))
264
286
  );
265
287
  return false;
266
288
  }
@@ -275,7 +297,7 @@ public class Cluster extends SubCommand {
275
297
  if (cluster == null) {
276
298
  player.sendMessage(
277
299
  TranslatableCaption.of("cluster.invalid_cluster_name"),
278
- Template.of("cluster", args[1])
300
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
279
301
  );
280
302
  return false;
281
303
  }
@@ -290,31 +312,36 @@ public class Cluster extends SubCommand {
290
312
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
291
313
  player.sendMessage(
292
314
  TranslatableCaption.of("permission.no_permission"),
293
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE_OTHER))
315
+ TagResolver.resolver(
316
+ "node",
317
+ Tag.inserting(Permission.PERMISSION_CLUSTER_DELETE_OTHER)
318
+ )
294
319
  );
295
320
  return false;
296
321
  }
297
322
  }
298
323
  DBFunc.delete(cluster);
299
- player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), Template.of(
324
+ player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), TagResolver.resolver(
300
325
  "cluster",
301
- String.valueOf(cluster)
326
+ Tag.inserting(Component.text(cluster.toString()))
302
327
  ));
303
328
  return true;
304
329
  }
305
- case "res":
306
- case "resize": {
330
+ case "res", "resize" -> {
307
331
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) {
308
332
  player.sendMessage(
309
333
  TranslatableCaption.of("permission.no_permission"),
310
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE))
334
+ TagResolver.resolver(
335
+ "node",
336
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE)
337
+ )
311
338
  );
312
339
  return false;
313
340
  }
314
341
  if (args.length != 3) {
315
342
  player.sendMessage(
316
343
  TranslatableCaption.of("commandconfig.command_syntax"),
317
- Template.of("value", "/plot cluster resize [name]")
344
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster resize [name]")))
318
345
  );
319
346
  return false;
320
347
  }
@@ -347,7 +374,10 @@ public class Cluster extends SubCommand {
347
374
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
348
375
  player.sendMessage(
349
376
  TranslatableCaption.of("permission.no_permission"),
350
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_OTHER))
377
+ TagResolver.resolver(
378
+ "node",
379
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)
380
+ )
351
381
  );
352
382
  return false;
353
383
  }
@@ -357,13 +387,12 @@ public class Cluster extends SubCommand {
357
387
  if (intersect != null) {
358
388
  player.sendMessage(
359
389
  TranslatableCaption.of("cluster.cluster_intersection"),
360
- Template.of("cluster", intersect.getName())
390
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(intersect.getName())))
361
391
  );
362
392
  return false;
363
393
  }
364
394
  Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
365
395
  Set<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
366
- // Set<Plot> removed = (HashSet<Plot>) existing.clone();
367
396
  Set<Plot> removed = new HashSet<>(existing);
368
397
 
369
398
  removed.removeAll(newPlots);
@@ -372,7 +401,10 @@ public class Cluster extends SubCommand {
372
401
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
373
402
  player.sendMessage(
374
403
  TranslatableCaption.of("permission.no_permission"),
375
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK))
404
+ TagResolver.resolver(
405
+ "node",
406
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)
407
+ )
376
408
  );
377
409
  return false;
378
410
  }
@@ -382,7 +414,10 @@ public class Cluster extends SubCommand {
382
414
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
383
415
  player.sendMessage(
384
416
  TranslatableCaption.of("permission.no_permission"),
385
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND))
417
+ TagResolver.resolver(
418
+ "node",
419
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)
420
+ )
386
421
  );
387
422
  return false;
388
423
  }
@@ -402,7 +437,9 @@ public class Cluster extends SubCommand {
402
437
  if (current + cluster.getArea() > allowed) {
403
438
  player.sendMessage(
404
439
  TranslatableCaption.of("permission.no_permission"),
405
- Template.of("node", Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea()))
440
+ TagResolver.resolver("node", Tag.inserting(Component.text(
441
+ Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea())
442
+ )))
406
443
  );
407
444
  return false;
408
445
  }
@@ -411,20 +448,21 @@ public class Cluster extends SubCommand {
411
448
  player.sendMessage(TranslatableCaption.of("cluster.cluster_resized"));
412
449
  return true;
413
450
  }
414
- case "add":
415
- case "inv":
416
- case "invite": {
451
+ case "add", "inv", "invite" -> {
417
452
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) {
418
453
  player.sendMessage(
419
454
  TranslatableCaption.of("permission.no_permission"),
420
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_INVITE))
455
+ TagResolver.resolver(
456
+ "node",
457
+ Tag.inserting(Permission.PERMISSION_CLUSTER_INVITE)
458
+ )
421
459
  );
422
460
  return false;
423
461
  }
424
462
  if (args.length != 2) {
425
463
  player.sendMessage(
426
464
  TranslatableCaption.of("commandconfig.command_syntax"),
427
- Template.of("value", "/plot cluster invite <player>")
465
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster invite <player>")))
428
466
  );
429
467
  return false;
430
468
  }
@@ -442,7 +480,10 @@ public class Cluster extends SubCommand {
442
480
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE_OTHER)) {
443
481
  player.sendMessage(
444
482
  TranslatableCaption.of("permission.no_permission"),
445
- Template.of("node", Permission.PERMISSION_CLUSTER_INVITE_OTHER.toString())
483
+ TagResolver.resolver(
484
+ "node",
485
+ Tag.inserting(Permission.PERMISSION_CLUSTER_INVITE_OTHER)
486
+ )
446
487
  );
447
488
  return false;
448
489
  }
@@ -455,7 +496,7 @@ public class Cluster extends SubCommand {
455
496
  } else if (throwable != null) {
456
497
  player.sendMessage(
457
498
  TranslatableCaption.of("errors.invalid_player"),
458
- Template.of("value", args[1])
499
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
459
500
  );
460
501
  } else {
461
502
  if (!cluster.isAdded(uuid)) {
@@ -467,7 +508,7 @@ public class Cluster extends SubCommand {
467
508
  if (otherPlayer != null) {
468
509
  player.sendMessage(
469
510
  TranslatableCaption.of("cluster.cluster_invited"),
470
- Template.of("cluster", cluster.getName())
511
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
471
512
  );
472
513
  }
473
514
  }
@@ -476,20 +517,21 @@ public class Cluster extends SubCommand {
476
517
  });
477
518
  return true;
478
519
  }
479
- case "k":
480
- case "remove":
481
- case "kick": {
520
+ case "k", "remove", "kick" -> {
482
521
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) {
483
522
  player.sendMessage(
484
523
  TranslatableCaption.of("permission.no_permission"),
485
- Template.of("node", Permission.PERMISSION_CLUSTER_KICK.toString())
524
+ TagResolver.resolver(
525
+ "node",
526
+ Tag.inserting(Permission.PERMISSION_CLUSTER_KICK)
527
+ )
486
528
  );
487
529
  return false;
488
530
  }
489
531
  if (args.length != 2) {
490
532
  player.sendMessage(
491
533
  TranslatableCaption.of("commandconfig.command_syntax"),
492
- Template.of("value", "/plot cluster kick <player>")
534
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster kick <player>")))
493
535
  );
494
536
  return false;
495
537
  }
@@ -506,7 +548,10 @@ public class Cluster extends SubCommand {
506
548
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK_OTHER)) {
507
549
  player.sendMessage(
508
550
  TranslatableCaption.of("permission.no_permission"),
509
- Template.of("node", Permission.PERMISSION_CLUSTER_KICK_OTHER.toString())
551
+ TagResolver.resolver(
552
+ "node",
553
+ Tag.inserting(Permission.PERMISSION_CLUSTER_KICK_OTHER)
554
+ )
510
555
  );
511
556
  return false;
512
557
  }
@@ -519,7 +564,7 @@ public class Cluster extends SubCommand {
519
564
  } else if (throwable != null) {
520
565
  player.sendMessage(
521
566
  TranslatableCaption.of("errors.invalid_player"),
522
- Template.of("value", args[1])
567
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
523
568
  );
524
569
  } else {
525
570
  // Can't kick if the player is yourself, the owner, or not added to the cluster
@@ -527,7 +572,7 @@ public class Cluster extends SubCommand {
527
572
  || !cluster.isAdded(uuid)) {
528
573
  player.sendMessage(
529
574
  TranslatableCaption.of("cluster.cannot_kick_player"),
530
- Template.of("value", cluster.getName())
575
+ TagResolver.resolver("value", Tag.inserting(Component.text(cluster.getName())))
531
576
  );
532
577
  } else {
533
578
  if (cluster.helpers.contains(uuid)) {
@@ -542,7 +587,7 @@ public class Cluster extends SubCommand {
542
587
  if (player2 != null) {
543
588
  player.sendMessage(
544
589
  TranslatableCaption.of("cluster.cluster_removed"),
545
- Template.of("cluster", cluster.getName())
590
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
546
591
  );
547
592
  }
548
593
  removePlayerPlots(cluster, uuid, player2.getLocation().getWorldName());
@@ -552,19 +597,21 @@ public class Cluster extends SubCommand {
552
597
  });
553
598
  return true;
554
599
  }
555
- case "quit":
556
- case "leave": {
600
+ case "quit", "leave" -> {
557
601
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LEAVE)) {
558
602
  player.sendMessage(
559
603
  TranslatableCaption.of("permission.no_permission"),
560
- Template.of("node", Permission.PERMISSION_CLUSTER_LEAVE.toString())
604
+ TagResolver.resolver(
605
+ "node",
606
+ Tag.inserting(Permission.PERMISSION_CLUSTER_LEAVE)
607
+ )
561
608
  );
562
609
  return false;
563
610
  }
564
611
  if (args.length != 1 && args.length != 2) {
565
612
  player.sendMessage(
566
613
  TranslatableCaption.of("commandconfig.command_syntax"),
567
- Template.of("value", "/plot cluster leave [name]")
614
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster leave [name]")))
568
615
  );
569
616
  return false;
570
617
  }
@@ -578,7 +625,7 @@ public class Cluster extends SubCommand {
578
625
  if (cluster == null) {
579
626
  player.sendMessage(
580
627
  TranslatableCaption.of("cluster.invalid_cluster_name"),
581
- Template.of("cluster", args[1])
628
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
582
629
  );
583
630
  return false;
584
631
  }
@@ -606,23 +653,29 @@ public class Cluster extends SubCommand {
606
653
  DBFunc.removeInvited(cluster, uuid);
607
654
  player.sendMessage(
608
655
  TranslatableCaption.of("cluster.cluster_removed"),
609
- Template.of("cluster", cluster.getName())
656
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
610
657
  );
611
658
  removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
612
659
  return true;
613
660
  }
614
- case "members": {
661
+ case "members" -> {
615
662
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) {
616
663
  player.sendMessage(
617
664
  TranslatableCaption.of("permission.no_permission"),
618
- Template.of("node", Permission.PERMISSION_CLUSTER_HELPERS.toString())
665
+ TagResolver.resolver(
666
+ "node",
667
+ Tag.inserting(Component.text(Permission.PERMISSION_CLUSTER_HELPERS.toString()))
668
+ )
619
669
  );
620
670
  return false;
621
671
  }
622
672
  if (args.length != 3) {
623
673
  player.sendMessage(
624
674
  TranslatableCaption.of("commandconfig.command_syntax"),
625
- Template.of("value", "/plot cluster members <add | remove> <player>")
675
+ TagResolver.resolver(
676
+ "value",
677
+ Tag.inserting(Component.text("/plot cluster members <add | remove> <player>"))
678
+ )
626
679
  );
627
680
  return false;
628
681
  }
@@ -643,7 +696,7 @@ public class Cluster extends SubCommand {
643
696
  } else if (throwable != null) {
644
697
  player.sendMessage(
645
698
  TranslatableCaption.of("errors.invalid_player"),
646
- Template.of("value", args[2])
699
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[2])))
647
700
  );
648
701
  } else {
649
702
  if (args[1].equalsIgnoreCase("add")) {
@@ -657,27 +710,30 @@ public class Cluster extends SubCommand {
657
710
  } else {
658
711
  player.sendMessage(
659
712
  TranslatableCaption.of("commandconfig.command_syntax"),
660
- Template.of("value", "/plot cluster members <add | remove> <player>")
713
+ TagResolver.resolver("value", Tag.inserting(Component.text(
714
+ "/plot cluster members <add | remove> <player>"
715
+ )))
661
716
  );
662
717
  }
663
718
  }
664
719
  });
665
720
  return true;
666
721
  }
667
- case "spawn":
668
- case "home":
669
- case "tp": {
722
+ case "spawn", "home", "tp" -> {
670
723
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) {
671
724
  player.sendMessage(
672
725
  TranslatableCaption.of("permission.no_permission"),
673
- Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
726
+ TagResolver.resolver(
727
+ "node",
728
+ Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
729
+ )
674
730
  );
675
731
  return false;
676
732
  }
677
733
  if (args.length != 2) {
678
734
  player.sendMessage(
679
735
  TranslatableCaption.of("commandconfig.command_syntax"),
680
- Template.of("value", "/plot cluster tp <name>")
736
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster tp <name>")))
681
737
  );
682
738
  return false;
683
739
  }
@@ -690,7 +746,7 @@ public class Cluster extends SubCommand {
690
746
  if (cluster == null) {
691
747
  player.sendMessage(
692
748
  TranslatableCaption.of("cluster.invalid_cluster_name"),
693
- Template.of("cluster", args[1])
749
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
694
750
  );
695
751
  return false;
696
752
  }
@@ -699,7 +755,10 @@ public class Cluster extends SubCommand {
699
755
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP_OTHER)) {
700
756
  player.sendMessage(
701
757
  TranslatableCaption.of("permission.no_permission"),
702
- Template.of("node", Permission.PERMISSION_CLUSTER_TP_OTHER.toString())
758
+ TagResolver.resolver(
759
+ "node",
760
+ Tag.inserting(Permission.PERMISSION_CLUSTER_TP_OTHER)
761
+ )
703
762
  );
704
763
  return false;
705
764
  }
@@ -708,21 +767,21 @@ public class Cluster extends SubCommand {
708
767
  player.sendMessage(TranslatableCaption.of("cluster.cluster_teleporting"));
709
768
  return true;
710
769
  }
711
- case "i":
712
- case "info":
713
- case "show":
714
- case "information": {
770
+ case "i", "info", "show", "information" -> {
715
771
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) {
716
772
  player.sendMessage(
717
773
  TranslatableCaption.of("permission.no_permission"),
718
- Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
774
+ TagResolver.resolver(
775
+ "node",
776
+ Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
777
+ )
719
778
  );
720
779
  return false;
721
780
  }
722
781
  if (args.length != 1 && args.length != 2) {
723
782
  player.sendMessage(
724
783
  TranslatableCaption.of("commandconfig.command_syntax"),
725
- Template.of("value", "/plot cluster info [name]")
784
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster info [name]")))
726
785
  );
727
786
  }
728
787
  PlotArea area = player.getApplicablePlotArea();
@@ -736,7 +795,7 @@ public class Cluster extends SubCommand {
736
795
  if (cluster == null) {
737
796
  player.sendMessage(
738
797
  TranslatableCaption.of("cluster.invalid_cluster_name"),
739
- Template.of("cluster", args[1])
798
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
740
799
  );
741
800
  return false;
742
801
  }
@@ -755,47 +814,36 @@ public class Cluster extends SubCommand {
755
814
  player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
756
815
  } else {
757
816
  final String owner;
758
- if (username == null) {
759
- owner = "unknown";
760
- } else {
761
- owner = username;
762
- }
817
+ owner = Objects.requireNonNullElse(username, "unknown");
763
818
  String name = cluster.getName();
764
819
  String size = (cluster.getP2().getX() - cluster.getP1().getX() + 1) + "x" + (
765
820
  cluster.getP2().getY() - cluster.getP1().getY() + 1);
766
821
  String rights = cluster.isAdded(player.getUUID()) + "";
767
822
  Caption message = TranslatableCaption.of("cluster.cluster_info");
768
- Template idTemplate = Template.of("id", id);
769
- Template ownerTemplate = Template.of("owner", owner);
770
- Template nameTemplate = Template.of("name", name);
771
- Template sizeTemplate = Template.of("size", size);
772
- Template rightsTemplate = Template.of("rights", rights);
773
- player.sendMessage(
774
- message,
775
- idTemplate,
776
- ownerTemplate,
777
- nameTemplate,
778
- sizeTemplate,
779
- rightsTemplate
780
- );
823
+ TagResolver resolver = TagResolver.builder()
824
+ .tag("id", Tag.inserting(Component.text(id)))
825
+ .tag("owner", Tag.inserting(Component.text(owner)))
826
+ .tag("name", Tag.inserting(Component.text(name)))
827
+ .tag("size", Tag.inserting(Component.text(size)))
828
+ .tag("rights", Tag.inserting(Component.text(rights)))
829
+ .build();
830
+ player.sendMessage(message, resolver);
781
831
  }
782
832
  });
783
833
  return true;
784
834
  }
785
- case "sh":
786
- case "setspawn":
787
- case "sethome": {
835
+ case "sh", "setspawn", "sethome" -> {
788
836
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) {
789
837
  player.sendMessage(
790
838
  TranslatableCaption.of("permission.no_permission"),
791
- Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME.toString())
839
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME))
792
840
  );
793
841
  return false;
794
842
  }
795
843
  if (args.length != 1 && args.length != 2) {
796
844
  player.sendMessage(
797
845
  TranslatableCaption.of("commandconfig.command_syntax"),
798
- Template.of("value", "/plot cluster sethome")
846
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster sethome")))
799
847
  );
800
848
  return false;
801
849
  }
@@ -812,7 +860,10 @@ public class Cluster extends SubCommand {
812
860
  if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) {
813
861
  player.sendMessage(
814
862
  TranslatableCaption.of("permission.no_permission"),
815
- Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME_OTHER.toString())
863
+ TagResolver.resolver(
864
+ "node",
865
+ Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME_OTHER)
866
+ )
816
867
  );
817
868
  return false;
818
869
  }
@@ -831,10 +882,7 @@ public class Cluster extends SubCommand {
831
882
  }
832
883
  player.sendMessage(
833
884
  TranslatableCaption.of("cluster.cluster_available_args"),
834
- Template.of(
835
- "list",
836
- "<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>"
837
- )
885
+ TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
838
886
  );
839
887
  return false;
840
888
  }
Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java CHANGED
@@ -25,7 +25,9 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
25
25
  import com.plotsquared.core.player.PlotPlayer;
26
26
  import com.plotsquared.core.util.task.TaskManager;
27
27
  import com.plotsquared.core.util.task.TaskTime;
28
- import net.kyori.adventure.text.minimessage.Template;
28
+ import net.kyori.adventure.text.Component;
29
+ import net.kyori.adventure.text.minimessage.tag.Tag;
30
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
29
31
  import org.checkerframework.checker.nullness.qual.Nullable;
30
32
 
31
33
  public class CmdConfirm {
@@ -52,9 +54,11 @@ public class CmdConfirm {
52
54
  if (commandStr != null) {
53
55
  player.sendMessage(
54
56
  TranslatableCaption.of("confirm.requires_confirm"),
55
- Template.of("command", commandStr),
56
- Template.of("timeout", String.valueOf(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)),
57
- Template.of("value", "/plot confirm")
57
+ TagResolver.builder()
58
+ .tag("command", Tag.inserting(Component.text(commandStr)))
59
+ .tag("timeout", Tag.inserting(Component.text(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)))
60
+ .tag("value", Tag.inserting(Component.text("/plot confirm")))
61
+ .build()
58
62
  );
59
63
  }
60
64
  TaskManager.runTaskLater(() -> {
Core/src/main/java/com/plotsquared/core/command/Command.java CHANGED
@@ -29,8 +29,10 @@ import com.plotsquared.core.util.StringComparison;
29
29
  import com.plotsquared.core.util.StringMan;
30
30
  import com.plotsquared.core.util.task.RunnableVal2;
31
31
  import com.plotsquared.core.util.task.RunnableVal3;
32
+ import net.kyori.adventure.text.Component;
32
33
  import net.kyori.adventure.text.minimessage.MiniMessage;
33
- import net.kyori.adventure.text.minimessage.Template;
34
+ import net.kyori.adventure.text.minimessage.tag.Tag;
35
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
34
36
  import org.checkerframework.checker.nullness.qual.Nullable;
35
37
 
36
38
  import java.lang.reflect.InvocationTargetException;
@@ -255,10 +257,14 @@ public abstract class Command {
255
257
  max = c.size();
256
258
  }
257
259
  // Send the header
258
- Template curTemplate = Template.of("cur", String.valueOf(page + 1));
259
- Template maxTemplate = Template.of("max", String.valueOf(totalPages + 1));
260
- Template amountTemplate = Template.of("amount", String.valueOf(c.size()));
261
- player.sendMessage(header, curTemplate, maxTemplate, amountTemplate);
260
+ player.sendMessage(
261
+ header,
262
+ TagResolver.builder()
263
+ .tag("cur", Tag.inserting(Component.text(page + 1)))
264
+ .tag("max", Tag.inserting(Component.text(totalPages + 1)))
265
+ .tag("amount", Tag.inserting(Component.text(c.size())))
266
+ .build()
267
+ );
262
268
  // Send the page content
263
269
  List<T> subList = c.subList(page * size, max);
264
270
  int i = page * size;
@@ -266,13 +272,24 @@ public abstract class Command {
266
272
  i++;
267
273
  final CaptionHolder msg = new CaptionHolder();
268
274
  add.run(i, obj, msg);
269
- player.sendMessage(msg.get(), msg.getTemplates());
275
+ player.sendMessage(msg.get(), msg.getTagResolvers());
270
276
  }
271
277
  // Send the footer
272
- Template command1 = Template.of("command1", baseCommand + " " + page);
273
- Template command2 = Template.of("command2", baseCommand + " " + (page + 2));
274
- Template clickable = Template.of("clickable", TranslatableCaption.of("list.clickable").getComponent(player));
275
- player.sendMessage(TranslatableCaption.of("list.page_turn"), command1, command2, clickable);
278
+ player.sendMessage(
279
+ TranslatableCaption.of("list.page_turn"),
280
+ TagResolver.builder()
281
+ .tag("cur", Tag.inserting(Component.text(page + 1)))
282
+ .tag(
283
+ "command1",
284
+ Tag.preProcessParsed(baseCommand + " " + page)
285
+ )
286
+ .tag("command2", Tag.preProcessParsed(baseCommand + " " + (page + 2)))
287
+ .tag(
288
+ "clickable",
289
+ Tag.inserting(TranslatableCaption.of("list.clickable").toComponent(player))
290
+ )
291
+ .build()
292
+ );
276
293
  }
277
294
 
278
295
  /**
@@ -324,7 +341,7 @@ public abstract class Command {
324
341
  if (commands.isEmpty()) {
325
342
  player.sendMessage(
326
343
  TranslatableCaption.of("commandconfig.did_you_mean"),
327
- Template.of("value", MainCommand.getInstance().help.getUsage())
344
+ TagResolver.resolver("value", Tag.inserting(Component.text(MainCommand.getInstance().help.getUsage())))
328
345
  );
329
346
  return CompletableFuture.completedFuture(false);
330
347
  }
@@ -345,7 +362,7 @@ public abstract class Command {
345
362
  }
346
363
  player.sendMessage(
347
364
  TranslatableCaption.of("commandconfig.did_you_mean"),
348
- Template.of("value", cmd.getUsage())
365
+ TagResolver.resolver("value", Tag.inserting(Component.text(cmd.getUsage())))
349
366
  );
350
367
  return CompletableFuture.completedFuture(false);
351
368
  }
@@ -380,7 +397,7 @@ public abstract class Command {
380
397
  // TODO improve or remove the Argument system
381
398
  player.sendMessage(
382
399
  TranslatableCaption.of("commandconfig.command_syntax"),
383
- Template.of("value", StringMan.join(fullSplit, " "))
400
+ TagResolver.resolver("value", Tag.inserting(Component.text(StringMan.join(fullSplit, " "))))
384
401
  );
385
402
  return false;
386
403
  }
@@ -469,7 +486,7 @@ public abstract class Command {
469
486
  if (message) {
470
487
  player.sendMessage(
471
488
  TranslatableCaption.of("permission.no_permission"),
472
- Template.of("node", getPermission())
489
+ TagResolver.resolver("node", Tag.inserting(Component.text(getPermission())))
473
490
  );
474
491
  }
475
492
  } else {
@@ -494,7 +511,7 @@ public abstract class Command {
494
511
  public void sendUsage(PlotPlayer<?> player) {
495
512
  player.sendMessage(
496
513
  TranslatableCaption.of("commandconfig.command_syntax"),
497
- Template.of("value", getUsage())
514
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
498
515
  );
499
516
  }
500
517
 
@@ -542,9 +559,10 @@ public abstract class Command {
542
559
 
543
560
  public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) {
544
561
  switch (args.length) {
545
- case 0:
562
+ case 0 -> {
546
563
  return this.allCommands;
547
- case 1:
564
+ }
565
+ case 1 -> {
548
566
  String arg = args[0].toLowerCase();
549
567
  if (space) {
550
568
  Command cmd = getCommand(arg);
@@ -563,13 +581,15 @@ public abstract class Command {
563
581
  }
564
582
  return commands;
565
583
  }
566
- default:
584
+ }
585
+ default -> {
567
586
  Command cmd = getCommand(args[0]);
568
587
  if (cmd != null) {
569
588
  return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
570
589
  } else {
571
590
  return null;
572
591
  }
592
+ }
573
593
  }
574
594
  }
575
595
 
@@ -598,13 +618,13 @@ public abstract class Command {
598
618
  return this.getFullId().hashCode();
599
619
  }
600
620
 
601
- public void checkTrue(boolean mustBeTrue, Caption message, Template... args) {
621
+ public void checkTrue(boolean mustBeTrue, Caption message, TagResolver... args) {
602
622
  if (!mustBeTrue) {
603
623
  throw new CommandException(message, args);
604
624
  }
605
625
  }
606
626
 
607
- public <T> T check(T object, Caption message, Template... args) {
627
+ public <T> T check(T object, Caption message, TagResolver... args) {
608
628
  if (object == null) {
609
629
  throw new CommandException(message, args);
610
630
  }
@@ -620,10 +640,10 @@ public abstract class Command {
620
640
 
621
641
  public static class CommandException extends RuntimeException {
622
642
 
623
- private final Template[] args;
624
643
  private final Caption message;
644
+ private final TagResolver[] args;
625
645
 
626
- public CommandException(final @Nullable Caption message, final Template... args) {
646
+ public CommandException(final @Nullable Caption message, final TagResolver... args) {
627
647
  this.message = message;
628
648
  this.args = args;
629
649
  }
Core/src/main/java/com/plotsquared/core/command/CommandCaller.java CHANGED
@@ -19,7 +19,7 @@
19
19
  package com.plotsquared.core.command;
20
20
 
21
21
  import com.plotsquared.core.configuration.caption.Caption;
22
- import net.kyori.adventure.text.minimessage.Template;
22
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
23
23
  import org.checkerframework.checker.nullness.qual.NonNull;
24
24
 
25
25
  /**
@@ -34,7 +34,7 @@ public interface CommandCaller {
34
34
  * @param caption Caption to send
35
35
  * @param replacements Variable replacements
36
36
  */
37
- void sendMessage(@NonNull Caption caption, @NonNull Template... replacements);
37
+ void sendMessage(@NonNull Caption caption, @NonNull TagResolver... replacements);
38
38
 
39
39
  /**
40
40
  * Check the player's permissions. <i>Will be cached if permission caching is enabled.</i>
Core/src/main/java/com/plotsquared/core/command/CommandCategory.java CHANGED
@@ -22,6 +22,8 @@ import com.plotsquared.core.configuration.caption.Caption;
22
22
  import com.plotsquared.core.configuration.caption.LocaleHolder;
23
23
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
24
24
  import com.plotsquared.core.player.PlotPlayer;
25
+ import net.kyori.adventure.text.Component;
26
+ import net.kyori.adventure.text.minimessage.MiniMessage;
25
27
  import org.checkerframework.checker.nullness.qual.NonNull;
26
28
 
27
29
  /**
@@ -90,6 +92,11 @@ public enum CommandCategory implements Caption {
90
92
  return this.caption.getComponent(localeHolder);
91
93
  }
92
94
 
95
+ @Override
96
+ public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
97
+ return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
98
+ }
99
+
93
100
  /**
94
101
  * Checks if a player has access to this command category
95
102
  *
Core/src/main/java/com/plotsquared/core/command/Comment.java CHANGED
@@ -27,7 +27,9 @@ import com.plotsquared.core.plot.comment.CommentInbox;
27
27
  import com.plotsquared.core.plot.comment.CommentManager;
28
28
  import com.plotsquared.core.plot.comment.PlotComment;
29
29
  import com.plotsquared.core.util.StringMan;
30
- import net.kyori.adventure.text.minimessage.Template;
30
+ import net.kyori.adventure.text.Component;
31
+ import net.kyori.adventure.text.minimessage.tag.Tag;
32
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
31
33
 
32
34
  import java.util.Arrays;
33
35
  import java.util.Locale;
@@ -44,8 +46,10 @@ public class Comment extends SubCommand {
44
46
  if (args.length < 2) {
45
47
  player.sendMessage(
46
48
  TranslatableCaption.of("comment.comment_syntax"),
47
- Template.of("command", "/plot comment [X;Z]"),
48
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
49
+ TagResolver.builder()
50
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
51
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
52
+ .build()
49
53
  );
50
54
  return false;
51
55
  }
@@ -64,8 +68,10 @@ public class Comment extends SubCommand {
64
68
  if (args.length < 3) {
65
69
  player.sendMessage(
66
70
  TranslatableCaption.of("comment.comment_syntax"),
67
- Template.of("command", "/plot comment [X;Z]"),
68
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
71
+ TagResolver.builder()
72
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
73
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
74
+ .build()
69
75
  );
70
76
  return false;
71
77
  }
@@ -76,8 +82,10 @@ public class Comment extends SubCommand {
76
82
  if (inbox == null) {
77
83
  player.sendMessage(
78
84
  TranslatableCaption.of("comment.comment_syntax"),
79
- Template.of("command", "/plot comment [X;Z]"),
80
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
85
+ TagResolver.builder()
86
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
87
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
88
+ .build()
81
89
  );
82
90
  return false;
83
91
  }
@@ -97,8 +105,10 @@ public class Comment extends SubCommand {
97
105
  player.sendMessage(TranslatableCaption.of("comment.no_plot_inbox"));
98
106
  player.sendMessage(
99
107
  TranslatableCaption.of("comment.comment_syntax"),
100
- Template.of("command", "/plot comment [X;Z]"),
101
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
108
+ TagResolver.builder()
109
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
110
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
111
+ .build()
102
112
  );
103
113
  return false;
104
114
  }
Core/src/main/java/com/plotsquared/core/command/Condense.java CHANGED
@@ -29,7 +29,9 @@ import com.plotsquared.core.util.MathMan;
29
29
  import com.plotsquared.core.util.WorldUtil;
30
30
  import com.plotsquared.core.util.task.TaskManager;
31
31
  import com.plotsquared.core.util.task.TaskTime;
32
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.minimessage.tag.Tag;
34
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
33
35
  import org.checkerframework.checker.nullness.qual.NonNull;
34
36
 
35
37
  import java.util.ArrayList;
@@ -68,7 +70,9 @@ public class Condense extends SubCommand {
68
70
  if (args.length != 2 && args.length != 3) {
69
71
  player.sendMessage(
70
72
  TranslatableCaption.of("commandconfig.command_syntax"),
71
- Template.of("value", "/plot condense <area> <start | stop | info> [radius]")
73
+ TagResolver.resolver("value", Tag.inserting(Component.text(
74
+ "/plot condense <area> <start | stop | info> [radius]"
75
+ )))
72
76
  );
73
77
  return false;
74
78
  }
@@ -82,7 +86,10 @@ public class Condense extends SubCommand {
82
86
  if (args.length == 2) {
83
87
  player.sendMessage(
84
88
  TranslatableCaption.of("commandconfig.command_syntax"),
85
- Template.of("value", "/plot condense" + area + " start <radius>")
89
+ TagResolver.resolver(
90
+ "value",
91
+ Tag.inserting(Component.text("/plot condense" + area + " start " + "<radius>"))
92
+ )
86
93
  );
87
94
  return false;
88
95
  }
@@ -181,8 +188,10 @@ public class Condense extends SubCommand {
181
188
  if (result.get()) {
182
189
  player.sendMessage(
183
190
  TranslatableCaption.of("condense.moving"),
184
- Template.of("origin", String.valueOf(origin)),
185
- Template.of("possible", String.valueOf(possible))
191
+ TagResolver.builder()
192
+ .tag("origin", Tag.inserting(Component.text(origin.toString())))
193
+ .tag("possible", Tag.inserting(Component.text(possible.toString())))
194
+ .build()
186
195
  );
187
196
  TaskManager.runTaskLater(task, TaskTime.ticks(1L));
188
197
  }
@@ -202,7 +211,7 @@ public class Condense extends SubCommand {
202
211
  if (i >= free.size()) {
203
212
  player.sendMessage(
204
213
  TranslatableCaption.of("condense.skipping"),
205
- Template.of("plot", String.valueOf(origin))
214
+ TagResolver.resolver("plot", Tag.inserting(Component.text(origin.toString())))
206
215
  );
207
216
  }
208
217
  }
@@ -223,7 +232,10 @@ public class Condense extends SubCommand {
223
232
  if (args.length == 2) {
224
233
  player.sendMessage(
225
234
  TranslatableCaption.of("commandconfig.command_syntax"),
226
- Template.of("value", "/plot condense " + area + " info <radius>")
235
+ TagResolver.resolver(
236
+ "value",
237
+ Tag.inserting(Component.text("/plot condense " + area + " info <radius>"))
238
+ )
227
239
  );
228
240
  return false;
229
241
  }
@@ -244,20 +256,20 @@ public class Condense extends SubCommand {
244
256
  player.sendMessage(TranslatableCaption.of("condense.default_eval"));
245
257
  player.sendMessage(
246
258
  TranslatableCaption.of("condense.minimum_radius"),
247
- Template.of("minimumRadius", String.valueOf(minimumRadius))
259
+ TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
248
260
  );
249
261
  player.sendMessage(
250
- TranslatableCaption.of("condense.minimum_radius"),
251
- Template.of("maxMove", String.valueOf(maxMove))
262
+ TranslatableCaption.of("condense.maximum_moved"),
263
+ TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
252
264
  );
253
265
  player.sendMessage(TranslatableCaption.of("condense.input_eval"));
254
266
  player.sendMessage(
255
267
  TranslatableCaption.of("condense.input_radius"),
256
- Template.of("radius", String.valueOf(radius))
268
+ TagResolver.resolver("radius", Tag.inserting(Component.text(radius)))
257
269
  );
258
270
  player.sendMessage(
259
271
  TranslatableCaption.of("condense.estimated_moves"),
260
- Template.of("userMove", String.valueOf(userMove))
272
+ TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
261
273
  );
262
274
  player.sendMessage(TranslatableCaption.of("condense.eta"));
263
275
  player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
@@ -266,7 +278,10 @@ public class Condense extends SubCommand {
266
278
  }
267
279
  player.sendMessage(
268
280
  TranslatableCaption.of("commandconfig.command_syntax"),
269
- Template.of("value", "/plot condense " + area.getWorldName() + " <start | stop | info> [radius]")
281
+ TagResolver.resolver(
282
+ "value",
283
+ Tag.inserting(Component.text("/plot condense " + area.getWorldName() + " <start | stop | info> [radius]"))
284
+ )
270
285
  );
271
286
  return false;
272
287
  }
Core/src/main/java/com/plotsquared/core/command/Continue.java CHANGED
@@ -29,7 +29,9 @@ import com.plotsquared.core.plot.Plot;
29
29
  import com.plotsquared.core.plot.flag.PlotFlag;
30
30
  import com.plotsquared.core.plot.flag.implementations.DoneFlag;
31
31
  import com.plotsquared.core.util.EventDispatcher;
32
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.minimessage.tag.Tag;
34
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
33
35
  import org.checkerframework.checker.nullness.qual.NonNull;
34
36
 
35
37
  @CommandDeclaration(command = "continue",
@@ -55,7 +57,9 @@ public class Continue extends SubCommand {
55
57
  if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
56
58
  player.sendMessage(
57
59
  TranslatableCaption.of("permission.no_permission"),
58
- Template.of("node", TranslatableCaption.of("permission.no_plot_perms").getComponent(player))
60
+ TagResolver.resolver("node", Tag.inserting(
61
+ TranslatableCaption.of("permission.no_plot_perms").toComponent(player)
62
+ ))
59
63
  );
60
64
  return false;
61
65
  }
@@ -68,7 +72,7 @@ public class Continue extends SubCommand {
68
72
  < player.getPlotCount() + size)) {
69
73
  player.sendMessage(
70
74
  TranslatableCaption.of("permission.cant_claim_more_plots"),
71
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
75
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
72
76
  );
73
77
  return false;
74
78
  }
@@ -82,7 +86,7 @@ public class Continue extends SubCommand {
82
86
  if (event.getEventResult() == Result.DENY) {
83
87
  player.sendMessage(
84
88
  TranslatableCaption.of("events.event_denied"),
85
- Template.of("value", "Done flag removal")
89
+ TagResolver.resolver("value", Tag.inserting(Component.text("Done flag removal")))
86
90
  );
87
91
  return true;
88
92
  }
Core/src/main/java/com/plotsquared/core/command/Copy.java CHANGED
@@ -23,7 +23,9 @@ import com.plotsquared.core.location.Location;
23
23
  import com.plotsquared.core.permissions.Permission;
24
24
  import com.plotsquared.core.player.PlotPlayer;
25
25
  import com.plotsquared.core.plot.Plot;
26
- import net.kyori.adventure.text.minimessage.Template;
26
+ import net.kyori.adventure.text.Component;
27
+ import net.kyori.adventure.text.minimessage.tag.Tag;
28
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
27
29
 
28
30
  @CommandDeclaration(command = "copy",
29
31
  permission = "plots.copy",
@@ -48,7 +50,7 @@ public class Copy extends SubCommand {
48
50
  if (args.length != 1) {
49
51
  player.sendMessage(
50
52
  TranslatableCaption.of("commandconfig.command_syntax"),
51
- Template.of("value", "/plot copy <X;Z>")
53
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot copy <X;Z>")))
52
54
  );
53
55
  return false;
54
56
  }
@@ -67,8 +69,12 @@ public class Copy extends SubCommand {
67
69
 
68
70
  plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
69
71
  if (result) {
70
- player.sendMessage(TranslatableCaption.of("move.copy_success"), Template.of("origin", String.valueOf(plot1)),
71
- Template.of("target", String.valueOf(plot2))
72
+ player.sendMessage(
73
+ TranslatableCaption.of("move.copy_success"),
74
+ TagResolver.builder()
75
+ .tag("origin", Tag.inserting(Component.text(plot1.toString())))
76
+ .tag("target", Tag.inserting(Component.text(plot2.toString())))
77
+ .build()
72
78
  );
73
79
  } else {
74
80
  player.sendMessage(TranslatableCaption.of("move.requires_unowned"));
Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java CHANGED
@@ -25,7 +25,9 @@ import com.plotsquared.core.generator.HybridUtils;
25
25
  import com.plotsquared.core.location.Location;
26
26
  import com.plotsquared.core.player.PlotPlayer;
27
27
  import com.plotsquared.core.plot.Plot;
28
- import net.kyori.adventure.text.minimessage.Template;
28
+ import net.kyori.adventure.text.Component;
29
+ import net.kyori.adventure.text.minimessage.tag.Tag;
30
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
29
31
  import org.checkerframework.checker.nullness.qual.NonNull;
30
32
 
31
33
  @CommandDeclaration(command = "createroadschematic",
@@ -61,7 +63,7 @@ public class CreateRoadSchematic extends SubCommand {
61
63
  this.hybridUtils.setupRoadSchematic(plot);
62
64
  player.sendMessage(
63
65
  TranslatableCaption.of("schematics.schematic_road_created"),
64
- Template.of("command", "/plot debugroadregen")
66
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugroadregen")))
65
67
  );
66
68
  return true;
67
69
  }
Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java CHANGED
@@ -40,7 +40,9 @@ import com.plotsquared.core.util.EventDispatcher;
40
40
  import com.plotsquared.core.util.FileUtils;
41
41
  import com.plotsquared.core.util.query.PlotQuery;
42
42
  import com.plotsquared.core.util.task.TaskManager;
43
- import net.kyori.adventure.text.minimessage.Template;
43
+ import net.kyori.adventure.text.Component;
44
+ import net.kyori.adventure.text.minimessage.tag.Tag;
45
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
44
46
  import org.checkerframework.checker.nullness.qual.NonNull;
45
47
 
46
48
  import java.io.File;
@@ -101,7 +103,10 @@ public class DatabaseCommand extends SubCommand {
101
103
  if (args.length < 1) {
102
104
  player.sendMessage(
103
105
  TranslatableCaption.of("commandconfig.command_syntax"),
104
- Template.of("value", "/plot database [area] <sqlite | mysql | import>")
106
+ TagResolver.resolver(
107
+ "value",
108
+ Tag.inserting(Component.text("/plot database [area] <sqlite | mysql | import>"))
109
+ )
105
110
  );
106
111
  return false;
107
112
  }
@@ -116,7 +121,7 @@ public class DatabaseCommand extends SubCommand {
116
121
  if (args.length < 1) {
117
122
  player.sendMessage(
118
123
  TranslatableCaption.of("commandconfig.command_syntax"),
119
- Template.of("value", "/plot database [area] <sqlite|mysql|import>")
124
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot database [area] <sqlite|mysql|import>")))
120
125
  );
121
126
  player.sendMessage(TranslatableCaption.of("database.arg"));
122
127
  return false;
@@ -129,7 +134,10 @@ public class DatabaseCommand extends SubCommand {
129
134
  if (args.length < 2) {
130
135
  player.sendMessage(
131
136
  TranslatableCaption.of("commandconfig.command_syntax"),
132
- Template.of("value", "/plot database import <sqlite file> [prefix]")
137
+ TagResolver.resolver(
138
+ "value",
139
+ Tag.inserting(Component.text("/plot database import <sqlite file> [prefix]"))
140
+ )
133
141
  );
134
142
  return false;
135
143
  }
@@ -140,7 +148,7 @@ public class DatabaseCommand extends SubCommand {
140
148
  if (!file.exists()) {
141
149
  player.sendMessage(
142
150
  TranslatableCaption.of("database.does_not_exist"),
143
- Template.of("value", String.valueOf(file))
151
+ TagResolver.resolver("value", Tag.inserting(Component.text(file.toString())))
144
152
  );
145
153
  return false;
146
154
  }
@@ -184,8 +192,10 @@ public class DatabaseCommand extends SubCommand {
184
192
  }
185
193
  player.sendMessage(
186
194
  TranslatableCaption.of("database.skipping_duplicated_plot"),
187
- Template.of("plot", String.valueOf(plot)),
188
- Template.of("id", String.valueOf(plot.temp))
195
+ TagResolver.builder()
196
+ .tag("plot", Tag.inserting(Component.text(plot.toString())))
197
+ .tag("id", Tag.inserting(Component.text(plot.temp)))
198
+ .build()
189
199
  );
190
200
  continue;
191
201
  }
Core/src/main/java/com/plotsquared/core/command/Debug.java CHANGED
@@ -34,7 +34,8 @@ import com.plotsquared.core.uuid.UUIDMapping;
34
34
  import com.sk89q.worldedit.world.entity.EntityType;
35
35
  import net.kyori.adventure.text.Component;
36
36
  import net.kyori.adventure.text.TextComponent;
37
- import net.kyori.adventure.text.minimessage.Template;
37
+ import net.kyori.adventure.text.minimessage.tag.Tag;
38
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
38
39
  import org.checkerframework.checker.nullness.qual.NonNull;
39
40
 
40
41
  import java.util.Collection;
@@ -68,7 +69,10 @@ public class Debug extends SubCommand {
68
69
  if (args.length == 0) {
69
70
  player.sendMessage(
70
71
  TranslatableCaption.of("commandconfig.command_syntax"),
71
- Template.of("value", "/plot debug <loadedchunks | player | debug-players | entitytypes | msg>")
72
+ TagResolver.resolver(
73
+ "value",
74
+ Tag.inserting(Component.text("/plot debug <loadedchunks | player | debug-players | entitytypes | msg>"))
75
+ )
72
76
  );
73
77
  }
74
78
  if (args.length > 0) {
@@ -95,7 +99,7 @@ public class Debug extends SubCommand {
95
99
  final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
96
100
  player.sendMessage(
97
101
  TranslatableCaption.of("debug.cached_uuids"),
98
- Template.of("value", String.valueOf(mappings.size()))
102
+ TagResolver.resolver("value", Tag.inserting(Component.text(mappings.size())))
99
103
  );
100
104
  return true;
101
105
  }
@@ -104,7 +108,7 @@ public class Debug extends SubCommand {
104
108
  for (final PlotPlayer<?> pp : PlotPlayer.getDebugModePlayers()) {
105
109
  player.sendMessage(
106
110
  TranslatableCaption.of("debug.player_in_debugmode_list"),
107
- Template.of("value", pp.getName())
111
+ TagResolver.resolver("value", Tag.inserting(Component.text(pp.getName())))
108
112
  );
109
113
  }
110
114
  return true;
@@ -114,10 +118,11 @@ public class Debug extends SubCommand {
114
118
  player.sendMessage(TranslatableCaption.of("debug.entity_categories"));
115
119
  EntityCategory.REGISTRY.forEach(category -> {
116
120
  final StringBuilder builder =
117
- new StringBuilder("§7- §6").append(category.getId()).append("§7: §6");
121
+ new StringBuilder("<gray>-</gray> <gold>").append(category.getId()).append("</gold><gray>: <gold>");
118
122
  for (final EntityType entityType : category.getAll()) {
119
123
  builder.append(entityType.getId()).append(" ");
120
124
  }
125
+ builder.append("</gold>");
121
126
  player.sendMessage(StaticCaption.of("<prefix>" + builder));
122
127
  });
123
128
  EntityType.REGISTRY.values().stream().sorted(Comparator.comparing(EntityType::getId))
@@ -137,28 +142,53 @@ public class Debug extends SubCommand {
137
142
  .getCaptionMap(TranslatableCaption.DEFAULT_NAMESPACE)
138
143
  .getCaptions();
139
144
  TextComponent.Builder information = Component.text();
140
- Component header = MINI_MESSAGE.parse(TranslatableCaption.of("debug.debug_header").getComponent(player) + "\n");
145
+ Component header = TranslatableCaption.of("debug.debug_header").toComponent(player)
146
+ .append(Component.newline());
141
147
  String line = TranslatableCaption.of("debug.debug_line").getComponent(player) + "\n";
142
148
  String section = TranslatableCaption.of("debug.debug_section").getComponent(player) + "\n";
143
149
  information.append(header);
144
- information.append(MINI_MESSAGE.parse(section, Template.of("val", "PlotArea")));
150
+ information.append(MINI_MESSAGE.deserialize(
151
+ section,
152
+ TagResolver.resolver("val", Tag.inserting(Component.text("PlotArea")))
153
+ ));
145
154
  information.append(MINI_MESSAGE
146
- .parse(
155
+ .deserialize(
147
156
  line,
148
- Template.of("var", "Plot Worlds"),
149
- Template.of("val", StringMan.join(this.plotAreaManager.getAllPlotAreas(), ", "))
157
+ TagResolver.builder()
158
+ .tag("var", Tag.inserting(Component.text("Plot Worlds")))
159
+ .tag(
160
+ "val",
161
+ Tag.inserting(Component.text(StringMan.join(
162
+ this.plotAreaManager.getAllPlotAreas(),
163
+ ", "
164
+ )))
165
+ )
166
+ .build()
150
167
  ));
151
168
  information.append(
152
- MINI_MESSAGE.parse(
169
+ MINI_MESSAGE.deserialize(
153
170
  line,
154
- Template.of("var", "Owned Plots"),
155
- Template.of("val", String.valueOf(PlotQuery.newQuery().allPlots().count()))
171
+ TagResolver.builder()
172
+ .tag("var", Tag.inserting(Component.text("Owned Plots")))
173
+ .tag(
174
+ "val",
175
+ Tag.inserting(Component.text(PlotQuery.newQuery().allPlots().count()))
176
+ )
177
+ .build()
156
178
  ));
157
- information.append(MINI_MESSAGE.parse(section, Template.of("val", "Messages")));
158
- information.append(MINI_MESSAGE.parse(
179
+ information.append(MINI_MESSAGE.deserialize(
180
+ section,
181
+ TagResolver.resolver("val", Tag.inserting(Component.text("Messages")))
182
+ ));
183
+ information.append(MINI_MESSAGE.deserialize(
159
184
  line,
160
- Template.of("var", "Total Messages"),
161
- Template.of("val", String.valueOf(captions.size()))
185
+ TagResolver.builder()
186
+ .tag("var", Tag.inserting(Component.text("Total Messages")))
187
+ .tag(
188
+ "val",
189
+ Tag.inserting(Component.text(captions.size()))
190
+ )
191
+ .build()
162
192
  ));
163
193
  player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(information.build())));
164
194
  return true;
Core/src/main/java/com/plotsquared/core/command/DebugExec.java CHANGED
@@ -36,7 +36,9 @@ import com.plotsquared.core.util.EventDispatcher;
36
36
  import com.plotsquared.core.util.StringMan;
37
37
  import com.plotsquared.core.util.query.PlotQuery;
38
38
  import com.plotsquared.core.util.task.RunnableVal;
39
- import net.kyori.adventure.text.minimessage.Template;
39
+ import net.kyori.adventure.text.Component;
40
+ import net.kyori.adventure.text.minimessage.tag.Tag;
41
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
40
42
  import org.checkerframework.checker.nullness.qual.NonNull;
41
43
 
42
44
  import java.util.Arrays;
@@ -95,7 +97,7 @@ public class DebugExec extends SubCommand {
95
97
  if (analysis != null) {
96
98
  player.sendMessage(
97
99
  TranslatableCaption.of("debugexec.changes_column"),
98
- Template.of("value", String.valueOf(analysis.changes))
100
+ TagResolver.resolver("value", Tag.inserting(Component.text(analysis.changes)))
99
101
  );
100
102
  return true;
101
103
  }
@@ -105,7 +107,7 @@ public class DebugExec extends SubCommand {
105
107
  public void run(PlotAnalysis value) {
106
108
  player.sendMessage(
107
109
  TranslatableCaption.of("debugexec.analyze_done"),
108
- Template.of("command", "/plot debugexec analyze")
110
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugexec analyze")))
109
111
  );
110
112
  }
111
113
  });
@@ -115,7 +117,10 @@ public class DebugExec extends SubCommand {
115
117
  if (args.length != 2) {
116
118
  player.sendMessage(
117
119
  TranslatableCaption.of("commandconfig.command_syntax"),
118
- Template.of("value", "/plot debugexec analyze <threshold>")
120
+ TagResolver.resolver(
121
+ "value",
122
+ Tag.inserting(Component.text("/plot debugexec analyze <threshold>"))
123
+ )
119
124
  );
120
125
  player.sendMessage(TranslatableCaption.of("debugexec.threshold_default"));
121
126
  return false;
@@ -126,7 +131,7 @@ public class DebugExec extends SubCommand {
126
131
  } catch (NumberFormatException ignored) {
127
132
  player.sendMessage(
128
133
  TranslatableCaption.of("debugexec.invalid_threshold"),
129
- Template.of("value", args[1])
134
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
130
135
  );
131
136
  player.sendMessage(TranslatableCaption.of("debugexec.threshold_default_double"));
132
137
  return false;
@@ -157,7 +162,7 @@ public class DebugExec extends SubCommand {
157
162
  if (args.length != 2) {
158
163
  player.sendMessage(
159
164
  TranslatableCaption.of("commandconfig.command_syntax"),
160
- Template.of("value", "/plot debugexec remove-flag <flag>")
165
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot debugexec remove-flag <flag>")))
161
166
  );
162
167
  return false;
163
168
  }
@@ -175,7 +180,7 @@ public class DebugExec extends SubCommand {
175
180
  }
176
181
  player.sendMessage(
177
182
  TranslatableCaption.of("debugexec.cleared_flag"),
178
- Template.of("value", flag)
183
+ TagResolver.resolver("value", Tag.inserting(Component.text(flag)))
179
184
  );
180
185
  return true;
181
186
  }
@@ -183,7 +188,10 @@ public class DebugExec extends SubCommand {
183
188
  if (args.length != 2) {
184
189
  player.sendMessage(
185
190
  TranslatableCaption.of("commandconfig.command_syntax"),
186
- Template.of("value", "Invalid syntax: /plot debugexec start-rgar <world>")
191
+ TagResolver.resolver(
192
+ "value",
193
+ Tag.inserting(Component.text("Invalid syntax: /plot debugexec start-rgar <world>"))
194
+ )
187
195
  );
188
196
  return false;
189
197
  }
@@ -191,7 +199,7 @@ public class DebugExec extends SubCommand {
191
199
  if (area == null) {
192
200
  player.sendMessage(
193
201
  TranslatableCaption.of("errors.not_valid_plot_world"),
194
- Template.of("value", args[1])
202
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
195
203
  );
196
204
  return false;
197
205
  }
Core/src/main/java/com/plotsquared/core/command/DebugPaste.java CHANGED
@@ -31,7 +31,9 @@ import com.plotsquared.core.inject.annotations.WorldFile;
31
31
  import com.plotsquared.core.player.PlotPlayer;
32
32
  import com.plotsquared.core.util.PremiumVerification;
33
33
  import com.plotsquared.core.util.task.TaskManager;
34
- import net.kyori.adventure.text.minimessage.Template;
34
+ import net.kyori.adventure.text.Component;
35
+ import net.kyori.adventure.text.minimessage.tag.Tag;
36
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
35
37
  import org.checkerframework.checker.nullness.qual.NonNull;
36
38
 
37
39
  import java.io.File;
@@ -69,9 +71,9 @@ public class DebugPaste extends SubCommand {
69
71
  StringBuilder b = new StringBuilder();
70
72
  b.append(
71
73
  """
72
- # Welcome to this paste
73
- # It is meant to provide us at IntellectualSites with better information about your problem
74
- """
74
+ # Welcome to this paste
75
+ # It is meant to provide us at IntellectualSites with better information about your problem
76
+ """
75
77
  );
76
78
  b.append("# PlotSquared Information\n");
77
79
  b.append("PlotSquared Version: ").append(PlotSquared.get().getVersion())
@@ -131,8 +133,10 @@ public class DebugPaste extends SubCommand {
131
133
  } catch (IOException ignored) {
132
134
  player.sendMessage(
133
135
  TranslatableCaption.of("debugpaste.latest_log"),
134
- Template.of("file", "latest.log"),
135
- Template.of("size", "14MB")
136
+ TagResolver.builder()
137
+ .tag("file", Tag.inserting(Component.text("latest.log")))
138
+ .tag("size", Tag.inserting(Component.text("14MB")))
139
+ .build()
136
140
  );
137
141
  }
138
142
 
@@ -141,7 +145,7 @@ public class DebugPaste extends SubCommand {
141
145
  } catch (final IllegalArgumentException ignored) {
142
146
  player.sendMessage(
143
147
  TranslatableCaption.of("debugpaste.empty_file"),
144
- Template.of("file", "settings.yml")
148
+ TagResolver.resolver("file", Tag.inserting(Component.text("settings.yml")))
145
149
  );
146
150
  }
147
151
  try {
@@ -149,7 +153,7 @@ public class DebugPaste extends SubCommand {
149
153
  } catch (final IllegalArgumentException ignored) {
150
154
  player.sendMessage(
151
155
  TranslatableCaption.of("debugpaste.empty_file"),
152
- Template.of("file", "worlds.yml")
156
+ TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
153
157
  );
154
158
  }
155
159
 
@@ -162,7 +166,7 @@ public class DebugPaste extends SubCommand {
162
166
  } catch (final IOException ignored) {
163
167
  player.sendMessage(
164
168
  TranslatableCaption.of("debugpaste.skip_multiverse"),
165
- Template.of("file", "worlds.yml")
169
+ TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
166
170
  );
167
171
  }
168
172
 
@@ -177,20 +181,20 @@ public class DebugPaste extends SubCommand {
177
181
  String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
178
182
  player.sendMessage(
179
183
  TranslatableCaption.of("debugpaste.debug_report_created"),
180
- Template.of("url", link)
184
+ TagResolver.resolver("url", Tag.preProcessParsed(link))
181
185
  );
182
186
  } else {
183
187
  final String responseMessage = jsonObject.get("response").getAsString();
184
188
  player.sendMessage(
185
189
  TranslatableCaption.of("debugpaste.creation_failed"),
186
- Template.of("value", responseMessage)
190
+ TagResolver.resolver("value", Tag.inserting(Component.text(responseMessage)))
187
191
  );
188
192
  }
189
193
  } catch (final Throwable throwable) {
190
194
  throwable.printStackTrace();
191
195
  player.sendMessage(
192
196
  TranslatableCaption.of("debugpaste.creation_failed"),
193
- Template.of("value", throwable.getMessage())
197
+ TagResolver.resolver("value", Tag.inserting(Component.text(throwable.getMessage())))
194
198
  );
195
199
  }
196
200
  } catch (IOException e) {
Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java CHANGED
@@ -28,7 +28,9 @@ import com.plotsquared.core.plot.Plot;
28
28
  import com.plotsquared.core.plot.PlotArea;
29
29
  import com.plotsquared.core.plot.PlotManager;
30
30
  import com.plotsquared.core.queue.QueueCoordinator;
31
- import net.kyori.adventure.text.minimessage.Template;
31
+ import net.kyori.adventure.text.Component;
32
+ import net.kyori.adventure.text.minimessage.tag.Tag;
33
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
32
34
  import org.checkerframework.checker.nullness.qual.NonNull;
33
35
 
34
36
  import java.util.Arrays;
@@ -60,7 +62,7 @@ public class DebugRoadRegen extends SubCommand {
60
62
  if (args.length < 1) {
61
63
  player.sendMessage(
62
64
  TranslatableCaption.of("commandconfig.command_syntax"),
63
- Template.of("value", DebugRoadRegen.USAGE)
65
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
64
66
  );
65
67
  return false;
66
68
  }
@@ -73,16 +75,19 @@ public class DebugRoadRegen extends SubCommand {
73
75
  }
74
76
  String kind = args[0].toLowerCase();
75
77
  switch (kind) {
76
- case "plot":
78
+ case "plot" -> {
77
79
  return regenPlot(player);
78
- case "region":
80
+ }
81
+ case "region" -> {
79
82
  return regenRegion(player, Arrays.copyOfRange(args, 1, args.length));
80
- default:
83
+ }
84
+ default -> {
81
85
  player.sendMessage(
82
86
  TranslatableCaption.of("commandconfig.command_syntax"),
83
- Template.of("value", DebugRoadRegen.USAGE)
87
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
84
88
  );
85
89
  return false;
90
+ }
86
91
  }
87
92
  }
88
93
 
@@ -103,11 +108,11 @@ public class DebugRoadRegen extends SubCommand {
103
108
  queue.setCompleteTask(() -> {
104
109
  player.sendMessage(
105
110
  TranslatableCaption.of("debugroadregen.regen_done"),
106
- Template.of("value", plot.getId().toString())
111
+ TagResolver.resolver("value", Tag.inserting(Component.text(plot.getId().toString())))
107
112
  );
108
113
  player.sendMessage(
109
114
  TranslatableCaption.of("debugroadregen.regen_all"),
110
- Template.of("value", "/plot regenallroads")
115
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads")))
111
116
  );
112
117
  });
113
118
  manager.createRoadEast(plot, queue);
@@ -126,18 +131,18 @@ public class DebugRoadRegen extends SubCommand {
126
131
  } catch (NumberFormatException ignored) {
127
132
  player.sendMessage(
128
133
  TranslatableCaption.of("invalid.not_valid_number"),
129
- Template.of("value", "0, 256")
134
+ TagResolver.resolver("value", Tag.inserting(Component.text("0, 256")))
130
135
  );
131
136
  player.sendMessage(
132
137
  TranslatableCaption.of("commandconfig.command_syntax"),
133
- Template.of("value", DebugRoadRegen.USAGE)
138
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
134
139
  );
135
140
  return false;
136
141
  }
137
142
  } else if (args.length != 0) {
138
143
  player.sendMessage(
139
144
  TranslatableCaption.of("commandconfig.command_syntax"),
140
- Template.of("value", DebugRoadRegen.USAGE)
145
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
141
146
  );
142
147
  return false;
143
148
  }
@@ -155,11 +160,11 @@ public class DebugRoadRegen extends SubCommand {
155
160
  }
156
161
  player.sendMessage(
157
162
  TranslatableCaption.of("debugroadregen.schematic"),
158
- Template.of("command", "/plot createroadschematic")
163
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot createroadschematic")))
159
164
  );
160
165
  player.sendMessage(
161
166
  TranslatableCaption.of("debugroadregen.regenallroads"),
162
- Template.of("command", "/plot regenallroads")
167
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot regenallroads")))
163
168
  );
164
169
  boolean result = this.hybridUtils.scheduleSingleRegionRoadUpdate(plot, height);
165
170
  if (!result) {
Core/src/main/java/com/plotsquared/core/command/Delete.java CHANGED
@@ -32,7 +32,9 @@ import com.plotsquared.core.util.EconHandler;
32
32
  import com.plotsquared.core.util.EventDispatcher;
33
33
  import com.plotsquared.core.util.PlotExpression;
34
34
  import com.plotsquared.core.util.task.TaskManager;
35
- import net.kyori.adventure.text.minimessage.Template;
35
+ import net.kyori.adventure.text.Component;
36
+ import net.kyori.adventure.text.minimessage.tag.Tag;
37
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
36
38
  import org.checkerframework.checker.nullness.qual.NonNull;
37
39
 
38
40
 
@@ -77,7 +79,7 @@ public class Delete extends SubCommand {
77
79
  if (eventResult == Result.DENY) {
78
80
  player.sendMessage(
79
81
  TranslatableCaption.of("events.event_denied"),
80
- Template.of("value", "Delete")
82
+ TagResolver.resolver("value", Tag.inserting(Component.text("Delete")))
81
83
  );
82
84
  return true;
83
85
  }
@@ -112,14 +114,17 @@ public class Delete extends SubCommand {
112
114
  this.econHandler.depositMoney(player, value);
113
115
  player.sendMessage(
114
116
  TranslatableCaption.of("economy.added_balance"),
115
- Template.of("money", this.econHandler.format(value))
117
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(value))))
116
118
  );
117
119
  }
118
120
  }
119
121
  player.sendMessage(
120
122
  TranslatableCaption.of("working.deleting_done"),
121
- Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
122
- Template.of("plot", plot.getId().toString())
123
+ TagResolver.resolver(
124
+ "amount",
125
+ Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
126
+ ),
127
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
123
128
  );
124
129
  eventDispatcher.callPostDelete(plot);
125
130
  });
Core/src/main/java/com/plotsquared/core/command/Deny.java CHANGED
@@ -34,7 +34,9 @@ import com.plotsquared.core.util.PlayerManager;
34
34
  import com.plotsquared.core.util.TabCompletions;
35
35
  import com.plotsquared.core.util.WorldUtil;
36
36
  import com.sk89q.worldedit.world.gamemode.GameModes;
37
- import net.kyori.adventure.text.minimessage.Template;
37
+ import net.kyori.adventure.text.Component;
38
+ import net.kyori.adventure.text.minimessage.tag.Tag;
39
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
38
40
  import org.checkerframework.checker.nullness.qual.NonNull;
39
41
 
40
42
  import java.util.Collection;
@@ -88,7 +90,7 @@ public class Deny extends SubCommand {
88
90
  if (size >= maxDenySize) {
89
91
  player.sendMessage(
90
92
  TranslatableCaption.of("members.plot_max_members_denied"),
91
- Template.of("amount", String.valueOf(size))
93
+ TagResolver.resolver("amount", Tag.inserting(Component.text(size)))
92
94
  );
93
95
  return false;
94
96
  }
@@ -99,7 +101,7 @@ public class Deny extends SubCommand {
99
101
  } else if (throwable != null || uuids.isEmpty()) {
100
102
  player.sendMessage(
101
103
  TranslatableCaption.of("errors.invalid_player"),
102
- Template.of("value", args[0])
104
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
103
105
  );
104
106
  } else {
105
107
  for (UUID uuid : uuids) {
@@ -107,7 +109,7 @@ public class Deny extends SubCommand {
107
109
  player.hasPermission(Permission.PERMISSION_DENY_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DENY))) {
108
110
  player.sendMessage(
109
111
  TranslatableCaption.of("errors.invalid_player"),
110
- Template.of("value", args[0])
112
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
111
113
  );
112
114
  } else if (plot.isOwner(uuid)) {
113
115
  player.sendMessage(TranslatableCaption.of("deny.cant_remove_owner"));
@@ -115,7 +117,10 @@ public class Deny extends SubCommand {
115
117
  } else if (plot.getDenied().contains(uuid)) {
116
118
  player.sendMessage(
117
119
  TranslatableCaption.of("member.already_added"),
118
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
120
+ TagResolver.resolver(
121
+ "player",
122
+ Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
123
+ )
119
124
  );
120
125
  return;
121
126
  } else {
Core/src/main/java/com/plotsquared/core/command/Desc.java CHANGED
@@ -27,7 +27,9 @@ import com.plotsquared.core.player.PlotPlayer;
27
27
  import com.plotsquared.core.plot.Plot;
28
28
  import com.plotsquared.core.plot.flag.implementations.DescriptionFlag;
29
29
  import com.plotsquared.core.util.EventDispatcher;
30
- import net.kyori.adventure.text.minimessage.Template;
30
+ import net.kyori.adventure.text.Component;
31
+ import net.kyori.adventure.text.minimessage.tag.Tag;
32
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
31
33
  import org.checkerframework.checker.nullness.qual.NonNull;
32
34
 
33
35
  @CommandDeclaration(command = "setdescription",
@@ -54,7 +56,7 @@ public class Desc extends SetCommand {
54
56
  if (event.getEventResult() == Result.DENY) {
55
57
  player.sendMessage(
56
58
  TranslatableCaption.of("events.event_denied"),
57
- Template.of("value", "Description removal")
59
+ TagResolver.resolver("value", Tag.inserting(Component.text("Description removal")))
58
60
  );
59
61
  return false;
60
62
  }
@@ -69,7 +71,7 @@ public class Desc extends SetCommand {
69
71
  if (event.getEventResult() == Result.DENY) {
70
72
  player.sendMessage(
71
73
  TranslatableCaption.of("events.event_denied"),
72
- Template.of("value", "Description set")
74
+ TagResolver.resolver("value", Tag.inserting(Component.text("Description set")))
73
75
  );
74
76
  return false;
75
77
  }
Core/src/main/java/com/plotsquared/core/command/Done.java CHANGED
@@ -35,7 +35,9 @@ import com.plotsquared.core.plot.flag.PlotFlag;
35
35
  import com.plotsquared.core.plot.flag.implementations.DoneFlag;
36
36
  import com.plotsquared.core.util.EventDispatcher;
37
37
  import com.plotsquared.core.util.task.RunnableVal;
38
- import net.kyori.adventure.text.minimessage.Template;
38
+ import net.kyori.adventure.text.Component;
39
+ import net.kyori.adventure.text.minimessage.tag.Tag;
40
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
39
41
  import org.checkerframework.checker.nullness.qual.NonNull;
40
42
 
41
43
  @CommandDeclaration(command = "done",
@@ -69,7 +71,7 @@ public class Done extends SubCommand {
69
71
  if (event.getEventResult() == Result.DENY) {
70
72
  player.sendMessage(
71
73
  TranslatableCaption.of("events.event_denied"),
72
- Template.of("value", "Done")
74
+ TagResolver.resolver("value", Tag.inserting(Component.text("Done")))
73
75
  );
74
76
  return true;
75
77
  }
@@ -89,7 +91,7 @@ public class Done extends SubCommand {
89
91
  plot.addRunning();
90
92
  player.sendMessage(
91
93
  TranslatableCaption.of("web.generating_link"),
92
- Template.of("plot", plot.getId().toString())
94
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
93
95
  );
94
96
  final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
95
97
  if (PlotSquared.platform().expireManager() == null || doneRequirements == null) {
@@ -101,7 +103,7 @@ public class Done extends SubCommand {
101
103
  public void run(PlotAnalysis value) {
102
104
  plot.removeRunning();
103
105
  boolean result =
104
- value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
106
+ value.getComplexity(doneRequirements) >= doneRequirements.THRESHOLD;
105
107
  finish(plot, player, result);
106
108
  }
107
109
  });
Core/src/main/java/com/plotsquared/core/command/Download.java CHANGED
@@ -33,7 +33,9 @@ import com.plotsquared.core.util.StringMan;
33
33
  import com.plotsquared.core.util.TabCompletions;
34
34
  import com.plotsquared.core.util.WorldUtil;
35
35
  import com.plotsquared.core.util.task.RunnableVal;
36
- import net.kyori.adventure.text.minimessage.Template;
36
+ import net.kyori.adventure.text.Component;
37
+ import net.kyori.adventure.text.minimessage.tag.Tag;
38
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
37
39
  import org.checkerframework.checker.nullness.qual.NonNull;
38
40
 
39
41
  import java.net.URL;
@@ -111,7 +113,10 @@ public class Download extends SubCommand {
111
113
  if (!player.hasPermission(Permission.PERMISSION_DOWNLOAD_WORLD)) {
112
114
  player.sendMessage(
113
115
  TranslatableCaption.of("permission.no_permission"),
114
- Template.of("node", Permission.PERMISSION_DOWNLOAD_WORLD.toString())
116
+ TagResolver.resolver(
117
+ "node",
118
+ Tag.inserting(Permission.PERMISSION_DOWNLOAD_WORLD)
119
+ )
115
120
  );
116
121
  return false;
117
122
  }
@@ -125,18 +130,24 @@ public class Download extends SubCommand {
125
130
  if (url == null) {
126
131
  player.sendMessage(
127
132
  TranslatableCaption.of("web.generating_link_failed"),
128
- Template.of("plot", plot.getId().toString())
133
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
129
134
  );
130
135
  return;
131
136
  }
132
- player.sendMessage(TranslatableCaption.of("web.generation_link_success_legacy_world"), Template.of("url", url.toString()));
137
+ player.sendMessage(
138
+ TranslatableCaption.of("web.generation_link_success_legacy_world"),
139
+ TagResolver.resolver("url", Tag.inserting(Component.text(url.toString())))
140
+ );
133
141
  }
134
142
  });
135
143
  } else {
136
144
  sendUsage(player);
137
145
  return false;
138
146
  }
139
- player.sendMessage(TranslatableCaption.of("web.generating_link"), Template.of("plot", plot.getId().toString()));
147
+ player.sendMessage(
148
+ TranslatableCaption.of("web.generating_link"),
149
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
150
+ );
140
151
  return true;
141
152
  }
142
153
 
@@ -174,20 +185,25 @@ public class Download extends SubCommand {
174
185
  if (Settings.Web.LEGACY_WEBINTERFACE) {
175
186
  schematicHandler
176
187
  .getCompoundTag(plot)
177
- .whenComplete((compoundTag, throwable) -> {
178
- schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() {
179
- @Override
180
- public void run(URL value) {
181
- plot.removeRunning();
182
- player.sendMessage(
183
- TranslatableCaption.of("web.generation_link_success"),
184
- Template.of("download", value.toString()),
185
- Template.of("delete", "Not available")
186
- );
187
- player.sendMessage(StaticCaption.of(value.toString()));
188
+ .whenComplete((compoundTag, throwable) -> schematicHandler.upload(
189
+ compoundTag,
190
+ null,
191
+ null,
192
+ new RunnableVal<>() {
193
+ @Override
194
+ public void run(URL value) {
195
+ plot.removeRunning();
196
+ player.sendMessage(
197
+ TranslatableCaption.of("web.generation_link_success"),
198
+ TagResolver.builder()
199
+ .tag("download", Tag.preProcessParsed(value.toString()))
200
+ .tag("delete", Tag.preProcessParsed("Not available"))
201
+ .build()
202
+ );
203
+ player.sendMessage(StaticCaption.of(value.toString()));
204
+ }
188
205
  }
189
- });
190
- });
206
+ ));
191
207
  return;
192
208
  }
193
209
  // TODO legacy support
@@ -196,13 +212,15 @@ public class Download extends SubCommand {
196
212
  if (throwable != null || !result.isSuccess()) {
197
213
  player.sendMessage(
198
214
  TranslatableCaption.of("web.generating_link_failed"),
199
- Template.of("plot", plot.getId().toString())
215
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
200
216
  );
201
217
  } else {
202
218
  player.sendMessage(
203
219
  TranslatableCaption.of("web.generation_link_success"),
204
- Template.of("download", result.getDownloadUrl()),
205
- Template.of("delete", result.getDeletionUrl())
220
+ TagResolver.builder()
221
+ .tag("download", Tag.preProcessParsed(result.getDownloadUrl()))
222
+ .tag("delete", Tag.preProcessParsed(result.getDeletionUrl()))
223
+ .build()
206
224
  );
207
225
  }
208
226
  });
Core/src/main/java/com/plotsquared/core/command/FlagCommand.java CHANGED
@@ -23,7 +23,6 @@ import com.plotsquared.core.PlotSquared;
23
23
  import com.plotsquared.core.configuration.Settings;
24
24
  import com.plotsquared.core.configuration.caption.CaptionUtility;
25
25
  import com.plotsquared.core.configuration.caption.StaticCaption;
26
- import com.plotsquared.core.configuration.caption.Templates;
27
26
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
28
27
  import com.plotsquared.core.events.PlotFlagAddEvent;
29
28
  import com.plotsquared.core.events.PlotFlagRemoveEvent;
@@ -47,7 +46,9 @@ import com.plotsquared.core.util.task.RunnableVal2;
47
46
  import com.plotsquared.core.util.task.RunnableVal3;
48
47
  import net.kyori.adventure.text.Component;
49
48
  import net.kyori.adventure.text.TextComponent;
50
- import net.kyori.adventure.text.minimessage.Template;
49
+ import net.kyori.adventure.text.format.Style;
50
+ import net.kyori.adventure.text.minimessage.tag.Tag;
51
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
51
52
  import org.checkerframework.checker.nullness.qual.NonNull;
52
53
  import org.checkerframework.checker.nullness.qual.Nullable;
53
54
 
@@ -84,7 +85,10 @@ public final class FlagCommand extends Command {
84
85
  private static boolean sendMessage(PlotPlayer<?> player) {
85
86
  player.sendMessage(
86
87
  TranslatableCaption.of("commandconfig.command_syntax"),
87
- Template.of("value", "/plot flag <set | remove | add | list | info> <flag> <value>")
88
+ TagResolver.resolver(
89
+ "value",
90
+ Tag.inserting(Component.text("/plot flag <set | remove | add | list | info> <flag> <value>"))
91
+ )
88
92
  );
89
93
  return true;
90
94
  }
@@ -110,9 +114,9 @@ public final class FlagCommand extends Command {
110
114
  if (!result) {
111
115
  player.sendMessage(
112
116
  TranslatableCaption.of("permission.no_permission"),
113
- Template.of(
117
+ TagResolver.resolver(
114
118
  "node",
115
- perm + "." + numeric
119
+ Tag.inserting(Component.text(perm + "." + numeric))
116
120
  )
117
121
  );
118
122
  }
@@ -129,16 +133,21 @@ public final class FlagCommand extends Command {
129
133
  );
130
134
  final boolean result = player.hasPermission(permission);
131
135
  if (!result) {
132
- player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", permission));
136
+ player.sendMessage(
137
+ TranslatableCaption.of("permission.no_permission"),
138
+ TagResolver.resolver("node", Tag.inserting(Component.text(permission)))
139
+ );
133
140
  return false;
134
141
  }
135
142
  }
136
143
  } catch (final FlagParseException e) {
137
144
  player.sendMessage(
138
145
  TranslatableCaption.of("flag.flag_parse_error"),
139
- Template.of("flag_name", flag.getName()),
140
- Template.of("flag_value", e.getValue()),
141
- Template.of("error", e.getErrorMessage().getComponent(player))
146
+ TagResolver.builder()
147
+ .tag("flag_name", Tag.inserting(Component.text(flag.getName())))
148
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
149
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
150
+ .build()
142
151
  );
143
152
  return false;
144
153
  } catch (final Exception e) {
@@ -155,7 +164,10 @@ public final class FlagCommand extends Command {
155
164
  perm = basePerm;
156
165
  }
157
166
  if (!result) {
158
- player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", perm));
167
+ player.sendMessage(
168
+ TranslatableCaption.of("permission.no_permission"),
169
+ TagResolver.resolver("node", Tag.inserting(Component.text(perm)))
170
+ );
159
171
  }
160
172
  return result;
161
173
  }
@@ -179,7 +191,7 @@ public final class FlagCommand extends Command {
179
191
  if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_SET_FLAG_OTHER)) {
180
192
  player.sendMessage(
181
193
  TranslatableCaption.of("permission.no_permission"),
182
- Template.of("node", String.valueOf(Permission.PERMISSION_SET_FLAG_OTHER))
194
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_SET_FLAG_OTHER))
183
195
  );
184
196
  return false;
185
197
  }
@@ -214,7 +226,7 @@ public final class FlagCommand extends Command {
214
226
  if (best != null) {
215
227
  player.sendMessage(
216
228
  TranslatableCaption.of("flag.not_valid_flag_suggested"),
217
- Template.of("value", best)
229
+ TagResolver.resolver("value", Tag.inserting(Component.text(best)))
218
230
  );
219
231
  suggested = true;
220
232
  }
@@ -323,7 +335,7 @@ public final class FlagCommand extends Command {
323
335
  if (args.length < 2) {
324
336
  player.sendMessage(
325
337
  TranslatableCaption.of("commandconfig.command_syntax"),
326
- Template.of("value", "/plot flag set <flag> <value>")
338
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag set <flag> <value>")))
327
339
  );
328
340
  return;
329
341
  }
@@ -336,7 +348,7 @@ public final class FlagCommand extends Command {
336
348
  if (event.getEventResult() == Result.DENY) {
337
349
  player.sendMessage(
338
350
  TranslatableCaption.of("events.event_denied"),
339
- Template.of("value", "Flag set")
351
+ TagResolver.resolver("value", Tag.inserting(Component.text("Flag set")))
340
352
  );
341
353
  return;
342
354
  }
@@ -352,15 +364,21 @@ public final class FlagCommand extends Command {
352
364
  } catch (final FlagParseException e) {
353
365
  player.sendMessage(
354
366
  TranslatableCaption.of("flag.flag_parse_error"),
355
- Template.of("flag_name", plotFlag.getName()),
356
- Template.of("flag_value", e.getValue()),
357
- Template.of("error", e.getErrorMessage().getComponent(player))
367
+ TagResolver.builder()
368
+ .tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
369
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
370
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
371
+ .build()
358
372
  );
359
373
  return;
360
374
  }
361
375
  plot.setFlag(parsed);
362
- player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
363
- Template.of("value", String.valueOf(parsed))
376
+ player.sendMessage(
377
+ TranslatableCaption.of("flag.flag_added"),
378
+ TagResolver.builder()
379
+ .tag("flag", Tag.inserting(Component.text(args[0])))
380
+ .tag("value", Tag.inserting(Component.text(parsed.toString())))
381
+ .build()
364
382
  );
365
383
  }
366
384
 
@@ -382,7 +400,7 @@ public final class FlagCommand extends Command {
382
400
  if (args.length < 2) {
383
401
  player.sendMessage(
384
402
  TranslatableCaption.of("commandconfig.command_syntax"),
385
- Template.of("value", "/plot flag add <flag> <values>")
403
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag add <flag> <values>")))
386
404
  );
387
405
  return;
388
406
  }
@@ -395,7 +413,7 @@ public final class FlagCommand extends Command {
395
413
  if (event.getEventResult() == Result.DENY) {
396
414
  player.sendMessage(
397
415
  TranslatableCaption.of("events.event_denied"),
398
- Template.of("value", "Flag add")
416
+ TagResolver.resolver("value", Tag.inserting(Component.text("Flag add")))
399
417
  );
400
418
  return;
401
419
  }
@@ -416,9 +434,11 @@ public final class FlagCommand extends Command {
416
434
  } catch (FlagParseException e) {
417
435
  player.sendMessage(
418
436
  TranslatableCaption.of("flag.flag_parse_error"),
419
- Template.of("flag_name", plotFlag.getName()),
420
- Template.of("flag_value", e.getValue()),
421
- Template.of("error", e.getErrorMessage().getComponent(player))
437
+ TagResolver.builder()
438
+ .tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
439
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
440
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
441
+ .build()
422
442
  );
423
443
  return;
424
444
  }
@@ -428,8 +448,12 @@ public final class FlagCommand extends Command {
428
448
  player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
429
449
  return;
430
450
  }
431
- player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
432
- Template.of("value", String.valueOf(parsed))
451
+ player.sendMessage(
452
+ TranslatableCaption.of("flag.flag_added"),
453
+ TagResolver.builder()
454
+ .tag("flag", Tag.inserting(Component.text(args[0])))
455
+ .tag("value", Tag.inserting(Component.text(parsed.toString())))
456
+ .build()
433
457
  );
434
458
  }
435
459
 
@@ -451,7 +475,7 @@ public final class FlagCommand extends Command {
451
475
  if (args.length != 1 && args.length != 2) {
452
476
  player.sendMessage(
453
477
  TranslatableCaption.of("commandconfig.command_syntax"),
454
- Template.of("value", "/plot flag remove <flag> [values]")
478
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag remove <flag> [values]")))
455
479
  );
456
480
  return;
457
481
  }
@@ -465,7 +489,7 @@ public final class FlagCommand extends Command {
465
489
  if (event.getEventResult() == Result.DENY) {
466
490
  player.sendMessage(
467
491
  TranslatableCaption.of("events.event_denied"),
468
- Template.of("value", "Flag remove")
492
+ TagResolver.resolver("value", Tag.inserting(Component.text("Flag remove")))
469
493
  );
470
494
  return;
471
495
  }
@@ -475,7 +499,10 @@ public final class FlagCommand extends Command {
475
499
  if (args.length != 2) {
476
500
  player.sendMessage(
477
501
  TranslatableCaption.of("permission.no_permission"),
478
- Template.of("node", Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))
502
+ TagResolver.resolver(
503
+ "node",
504
+ Tag.inserting(Component.text(Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase())))
505
+ )
479
506
  );
480
507
  return;
481
508
  }
@@ -490,9 +517,11 @@ public final class FlagCommand extends Command {
490
517
  } catch (final FlagParseException e) {
491
518
  player.sendMessage(
492
519
  TranslatableCaption.of("flag.flag_parse_error"),
493
- Template.of("flag_name", flag.getName()),
494
- Template.of("flag_value", e.getValue()),
495
- Template.of("error", String.valueOf(e.getErrorMessage()))
520
+ TagResolver.builder()
521
+ .tag("flag_name", Tag.inserting(Component.text(flag.getName())))
522
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
523
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
524
+ .build()
496
525
  );
497
526
  return;
498
527
  }
@@ -503,10 +532,13 @@ public final class FlagCommand extends Command {
503
532
  if (list.removeAll((List) parsedFlag.getValue())) {
504
533
  if (list.isEmpty()) {
505
534
  if (plot.removeFlag(flag)) {
506
- player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
507
- "value",
508
- String.valueOf(flagWithOldValue)
509
- ));
535
+ player.sendMessage(
536
+ TranslatableCaption.of("flag.flag_removed"),
537
+ TagResolver.builder()
538
+ .tag("flag", Tag.inserting(Component.text(args[0])))
539
+ .tag("value", Tag.inserting(Component.text(flag.toString())))
540
+ .build()
541
+ );
510
542
  return;
511
543
  } else {
512
544
  player.sendMessage(TranslatableCaption.of("flag.flag_not_removed"));
@@ -518,7 +550,10 @@ public final class FlagCommand extends Command {
518
550
  if (addEvent.getEventResult() == Result.DENY) {
519
551
  player.sendMessage(
520
552
  TranslatableCaption.of("events.event_denied"),
521
- Template.of("value", "Re-addition of " + plotFlag.getName())
553
+ TagResolver.resolver(
554
+ "value",
555
+ Tag.inserting(Component.text("Re-addition of " + plotFlag.getName()))
556
+ )
522
557
  );
523
558
  return;
524
559
  }
@@ -541,10 +576,13 @@ public final class FlagCommand extends Command {
541
576
  return;
542
577
  }
543
578
  }
544
- player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
545
- "value",
546
- String.valueOf(flagWithOldValue)
547
- ));
579
+ player.sendMessage(
580
+ TranslatableCaption.of("flag.flag_removed"),
581
+ TagResolver.builder()
582
+ .tag("flag", Tag.inserting(Component.text(args[0])))
583
+ .tag("value", Tag.inserting(Component.text(flag.toString())))
584
+ .build()
585
+ );
548
586
  }
549
587
 
550
588
  @CommandDeclaration(command = "list",
@@ -562,34 +600,35 @@ public final class FlagCommand extends Command {
562
600
  return;
563
601
  }
564
602
 
565
- final Map<String, ArrayList<String>> flags = new HashMap<>();
603
+ final Map<Component, ArrayList<String>> flags = new HashMap<>();
566
604
  for (PlotFlag<?, ?> plotFlag : GlobalFlagContainer.getInstance().getRecognizedPlotFlags()) {
567
605
  if (plotFlag instanceof InternalFlag) {
568
606
  continue;
569
607
  }
570
- final String category = MINI_MESSAGE.stripTokens(plotFlag.getFlagCategory().getComponent(player));
571
- final Collection<String> flagList =
572
- flags.computeIfAbsent(category, k -> new ArrayList<>());
608
+ final Component category = plotFlag.getFlagCategory().toComponent(player);
609
+ final Collection<String> flagList = flags.computeIfAbsent(category, k -> new ArrayList<>());
573
610
  flagList.add(plotFlag.getName());
574
611
  }
575
612
 
576
- for (final Map.Entry<String, ArrayList<String>> entry : flags.entrySet()) {
613
+ for (final Map.Entry<Component, ArrayList<String>> entry : flags.entrySet()) {
577
614
  Collections.sort(entry.getValue());
578
615
  Component category =
579
- MINI_MESSAGE.parse(
616
+ MINI_MESSAGE.deserialize(
580
617
  TranslatableCaption.of("flag.flag_list_categories").getComponent(player),
581
- Template.of("category", entry.getKey())
618
+ TagResolver.resolver("category", Tag.inserting(entry.getKey().style(Style.empty())))
582
619
  );
583
620
  TextComponent.Builder builder = Component.text().append(category);
584
621
  final Iterator<String> flagIterator = entry.getValue().iterator();
585
622
  while (flagIterator.hasNext()) {
586
623
  final String flag = flagIterator.next();
587
624
  builder.append(MINI_MESSAGE
588
- .parse(
625
+ .deserialize(
589
626
  TranslatableCaption.of("flag.flag_list_flag").getComponent(player),
590
- Template.of("command", "/plot flag info " + flag),
591
- Template.of("flag", flag),
592
- Template.of("suffix", flagIterator.hasNext() ? ", " : "")
627
+ TagResolver.builder()
628
+ .tag("command", Tag.preProcessParsed("/plot flag info " + flag))
629
+ .tag("flag", Tag.inserting(Component.text(flag)))
630
+ .tag("suffix", Tag.inserting(Component.text(flagIterator.hasNext() ? ", " : "")))
631
+ .build()
593
632
  ));
594
633
  }
595
634
  player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
@@ -613,7 +652,7 @@ public final class FlagCommand extends Command {
613
652
  if (args.length < 1) {
614
653
  player.sendMessage(
615
654
  TranslatableCaption.of("commandconfig.command_syntax"),
616
- Template.of("value", "/plot flag info <flag>")
655
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag info <flag>")))
617
656
  );
618
657
  return;
619
658
  }
@@ -621,11 +660,17 @@ public final class FlagCommand extends Command {
621
660
  if (plotFlag != null) {
622
661
  player.sendMessage(TranslatableCaption.of("flag.flag_info_header"));
623
662
  // Flag name
624
- player.sendMessage(TranslatableCaption.of("flag.flag_info_name"), Template.of("flag", plotFlag.getName()));
663
+ player.sendMessage(
664
+ TranslatableCaption.of("flag.flag_info_name"),
665
+ TagResolver.resolver("flag", Tag.inserting(Component.text(plotFlag.getName())))
666
+ );
625
667
  // Flag category
626
668
  player.sendMessage(
627
669
  TranslatableCaption.of("flag.flag_info_category"),
628
- Templates.of(player, "value", plotFlag.getFlagCategory())
670
+ TagResolver.resolver(
671
+ "value",
672
+ Tag.inserting(plotFlag.getFlagCategory().toComponent(player))
673
+ )
629
674
  );
630
675
  // Flag description
631
676
  // TODO maybe merge and \n instead?
@@ -634,16 +679,18 @@ public final class FlagCommand extends Command {
634
679
  // Flag example
635
680
  player.sendMessage(
636
681
  TranslatableCaption.of("flag.flag_info_example"),
637
- Template.of("command", "/plot flag set"),
638
- Template.of("flag", plotFlag.getName()),
639
- Template.of("value", plotFlag.getExample())
682
+ TagResolver.builder()
683
+ .tag("command", Tag.preProcessParsed("/plot flag set"))
684
+ .tag("flag", Tag.preProcessParsed(plotFlag.getName()))
685
+ .tag("value", Tag.preProcessParsed(plotFlag.getExample()))
686
+ .build()
640
687
  );
641
688
  // Default value
642
689
  final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
643
690
  .getFlagErased(plotFlag.getClass()).toString();
644
691
  player.sendMessage(
645
692
  TranslatableCaption.of("flag.flag_info_default_value"),
646
- Template.of("value", defaultValue)
693
+ TagResolver.resolver("value", Tag.inserting(Component.text(defaultValue)))
647
694
  );
648
695
  // Footer. Done this way to prevent the duplicate-message-thingy from catching it
649
696
  player.sendMessage(TranslatableCaption.of("flag.flag_info_footer"));
Core/src/main/java/com/plotsquared/core/command/Grant.java CHANGED
@@ -31,7 +31,9 @@ import com.plotsquared.core.util.TabCompletions;
31
31
  import com.plotsquared.core.util.task.RunnableVal;
32
32
  import com.plotsquared.core.util.task.RunnableVal2;
33
33
  import com.plotsquared.core.util.task.RunnableVal3;
34
- import net.kyori.adventure.text.minimessage.Template;
34
+ import net.kyori.adventure.text.Component;
35
+ import net.kyori.adventure.text.minimessage.tag.Tag;
36
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
35
37
 
36
38
  import java.util.Collection;
37
39
  import java.util.Collections;
@@ -63,7 +65,7 @@ public class Grant extends Command {
63
65
  checkTrue(
64
66
  args.length >= 1 && args.length <= 2,
65
67
  TranslatableCaption.of("commandconfig.command_syntax"),
66
- Template.of("value", "/plot grant <check | add> [player]")
68
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot grant <check | add> [player]")))
67
69
  );
68
70
  final String arg0 = args[0].toLowerCase();
69
71
  switch (arg0) {
@@ -71,7 +73,7 @@ public class Grant extends Command {
71
73
  if (!player.hasPermission(Permission.PERMISSION_GRANT.format(arg0))) {
72
74
  player.sendMessage(
73
75
  TranslatableCaption.of("permission.no_permission"),
74
- Template.of("node", Permission.PERMISSION_GRANT.format(arg0))
76
+ TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_GRANT.format(arg0))))
75
77
  );
76
78
  return CompletableFuture.completedFuture(false);
77
79
  }
@@ -84,7 +86,7 @@ public class Grant extends Command {
84
86
  } else if (throwable != null || uuids.size() != 1) {
85
87
  player.sendMessage(
86
88
  TranslatableCaption.of("errors.invalid_player"),
87
- Template.of("value", String.valueOf(uuids))
89
+ TagResolver.resolver("value", Tag.inserting(Component.text(String.valueOf(uuids))))
88
90
  );
89
91
  } else {
90
92
  final UUID uuid = uuids.iterator().next();
@@ -95,7 +97,7 @@ public class Grant extends Command {
95
97
  if (args[0].equalsIgnoreCase("check")) {
96
98
  player.sendMessage(
97
99
  TranslatableCaption.of("grants.granted_plots"),
98
- Template.of("amount", String.valueOf(access.get().orElse(0)))
100
+ TagResolver.resolver("amount", Tag.inserting(Component.text(access.get().orElse(0))))
99
101
  );
100
102
  } else {
101
103
  access.set(access.get().orElse(0) + 1);
@@ -115,7 +117,7 @@ public class Grant extends Command {
115
117
  }
116
118
  player.sendMessage(
117
119
  TranslatableCaption.of("grants.granted_plots"),
118
- Template.of("amount", String.valueOf(granted))
120
+ TagResolver.resolver("amount", Tag.inserting(Component.text(granted)))
119
121
  );
120
122
  } else { // add
121
123
  int amount;
@@ -130,7 +132,7 @@ public class Grant extends Command {
130
132
  DBFunc.addPersistentMeta(uuid, key, rawData, replace);
131
133
  player.sendMessage(
132
134
  TranslatableCaption.of("grants.added"),
133
- Template.of("grants", String.valueOf(amount))
135
+ TagResolver.resolver("grants", Tag.inserting(Component.text(amount)))
134
136
  );
135
137
  }
136
138
  }
Core/src/main/java/com/plotsquared/core/command/Help.java CHANGED
@@ -28,7 +28,8 @@ import com.plotsquared.core.util.task.RunnableVal2;
28
28
  import com.plotsquared.core.util.task.RunnableVal3;
29
29
  import net.kyori.adventure.text.Component;
30
30
  import net.kyori.adventure.text.TextComponent;
31
- import net.kyori.adventure.text.minimessage.Template;
31
+ import net.kyori.adventure.text.minimessage.tag.Tag;
32
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
32
33
 
33
34
  import java.util.ArrayList;
34
35
  import java.util.Collection;
@@ -59,9 +60,10 @@ public class Help extends Command {
59
60
  RunnableVal2<Command, CommandResult> whenDone
60
61
  ) {
61
62
  switch (args.length) {
62
- case 0:
63
+ case 0 -> {
63
64
  return displayHelp(player, null, 0);
64
- case 1:
65
+ }
66
+ case 1 -> {
65
67
  if (MathMan.isInteger(args[0])) {
66
68
  try {
67
69
  return displayHelp(player, null, Integer.parseInt(args[0]));
@@ -71,7 +73,8 @@ public class Help extends Command {
71
73
  } else {
72
74
  return displayHelp(player, args[0], 1);
73
75
  }
74
- case 2:
76
+ }
77
+ case 2 -> {
75
78
  if (MathMan.isInteger(args[1])) {
76
79
  try {
77
80
  return displayHelp(player, args[0], Integer.parseInt(args[1]));
@@ -80,8 +83,8 @@ public class Help extends Command {
80
83
  }
81
84
  }
82
85
  return CompletableFuture.completedFuture(false);
83
- default:
84
- sendUsage(player);
86
+ }
87
+ default -> sendUsage(player);
85
88
  }
86
89
  return CompletableFuture.completedFuture(true);
87
90
  }
@@ -110,27 +113,36 @@ public class Help extends Command {
110
113
  }
111
114
  if (cat == null && page == 0) {
112
115
  TextComponent.Builder builder = Component.text();
113
- builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("help.help_header").getComponent(player)));
116
+ builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player)));
114
117
  for (CommandCategory c : CommandCategory.values()) {
115
118
  if (!c.canAccess(player)) {
116
119
  continue;
117
120
  }
118
121
  builder.append(Component.newline()).append(MINI_MESSAGE
119
- .parse(
122
+ .deserialize(
120
123
  TranslatableCaption.of("help.help_info_item").getComponent(player),
121
- Template.of("command", "/plot help"),
122
- Template.of("category", c.name().toLowerCase()),
123
- Template.of("category_desc", c.getComponent(player))
124
+ TagResolver.builder()
125
+ .tag("command", Tag.inserting(Component.text("/plot help")))
126
+ .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
127
+ .tag("category_desc", Tag.inserting(c.toComponent(player)))
128
+ .build()
124
129
  ));
125
130
  }
126
131
  builder.append(Component.newline()).append(MINI_MESSAGE
127
- .parse(
132
+ .deserialize(
128
133
  TranslatableCaption.of("help.help_info_item").getComponent(player),
129
- Template.of("command", "/plot help"),
130
- Template.of("category", "all"),
131
- Template.of("category_desc", "Display all commands")
134
+ TagResolver.builder()
135
+ .tag("command", Tag.inserting(Component.text("/plot help")))
136
+ .tag("category", Tag.inserting(Component.text("all")))
137
+ .tag(
138
+ "category_desc",
139
+ Tag.inserting(TranslatableCaption
140
+ .of("help.help_display_all_commands")
141
+ .toComponent(player))
142
+ )
143
+ .build()
132
144
  ));
133
- builder.append(Component.newline()).append(MINI_MESSAGE.parse(TranslatableCaption
145
+ builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
134
146
  .of("help.help_footer")
135
147
  .getComponent(player)));
136
148
  player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
Core/src/main/java/com/plotsquared/core/command/HomeCommand.java CHANGED
@@ -34,7 +34,9 @@ import com.plotsquared.core.util.query.PlotQuery;
34
34
  import com.plotsquared.core.util.query.SortingStrategy;
35
35
  import com.plotsquared.core.util.task.RunnableVal2;
36
36
  import com.plotsquared.core.util.task.RunnableVal3;
37
- import net.kyori.adventure.text.minimessage.Template;
37
+ import net.kyori.adventure.text.Component;
38
+ import net.kyori.adventure.text.minimessage.tag.Tag;
39
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
38
40
  import org.checkerframework.checker.nullness.qual.NonNull;
39
41
 
40
42
  import java.util.ArrayList;
@@ -71,8 +73,10 @@ public class HomeCommand extends Command {
71
73
  } else if (plots.size() < page || page < 1) {
72
74
  player.sendMessage(
73
75
  TranslatableCaption.of("invalid.number_not_in_range"),
74
- Template.of("min", "1"),
75
- Template.of("max", String.valueOf(plots.size()))
76
+ TagResolver.builder()
77
+ .tag("min", Tag.inserting(Component.text(1)))
78
+ .tag("max", Tag.inserting(Component.text(plots.size())))
79
+ .build()
76
80
  );
77
81
  return;
78
82
  }
@@ -106,7 +110,7 @@ public class HomeCommand extends Command {
106
110
  if (!player.hasPermission(Permission.PERMISSION_VISIT_OWNED) && !player.hasPermission(Permission.PERMISSION_HOME)) {
107
111
  player.sendMessage(
108
112
  TranslatableCaption.of("permission.no_permission"),
109
- Template.of("node", Permission.PERMISSION_VISIT_OWNED.toString())
113
+ TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_VISIT_OWNED.toString())))
110
114
  );
111
115
  return CompletableFuture.completedFuture(false);
112
116
  }
@@ -128,7 +132,7 @@ public class HomeCommand extends Command {
128
132
  } catch (NumberFormatException ignored) {
129
133
  player.sendMessage(
130
134
  TranslatableCaption.of("invalid.not_a_number"),
131
- Template.of("value", identifier)
135
+ TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
132
136
  );
133
137
  return CompletableFuture.completedFuture(false);
134
138
  }
@@ -169,7 +173,7 @@ public class HomeCommand extends Command {
169
173
  } catch (NumberFormatException ignored) {
170
174
  player.sendMessage(
171
175
  TranslatableCaption.of("invalid.not_a_number"),
172
- Template.of("value", identifier)
176
+ TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
173
177
  );
174
178
  return CompletableFuture.completedFuture(false);
175
179
  }
Core/src/main/java/com/plotsquared/core/command/Inbox.java CHANGED
@@ -20,7 +20,6 @@ package com.plotsquared.core.command;
20
20
 
21
21
  import com.google.inject.TypeLiteral;
22
22
  import com.plotsquared.core.configuration.caption.StaticCaption;
23
- import com.plotsquared.core.configuration.caption.Templates;
24
23
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
25
24
  import com.plotsquared.core.permissions.Permission;
26
25
  import com.plotsquared.core.player.MetaDataAccess;
@@ -35,7 +34,8 @@ import com.plotsquared.core.util.TabCompletions;
35
34
  import com.plotsquared.core.util.task.RunnableVal;
36
35
  import net.kyori.adventure.text.Component;
37
36
  import net.kyori.adventure.text.TextComponent;
38
- import net.kyori.adventure.text.minimessage.Template;
37
+ import net.kyori.adventure.text.minimessage.tag.Tag;
38
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
39
39
 
40
40
  import java.util.Collection;
41
41
  import java.util.Collections;
@@ -71,41 +71,44 @@ public class Inbox extends SubCommand {
71
71
  max = comments.length;
72
72
  }
73
73
  TextComponent.Builder builder = Component.text();
74
- builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n',
75
- Template.of("amount", String.valueOf(comments.length)), Template.of("cur", String.valueOf(page + 1)),
76
- Template.of("max", String.valueOf(totalPages + 1)), Template.of("word", "all")
74
+ builder.append(MINI_MESSAGE.deserialize(
75
+ TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n',
76
+ TagResolver.builder()
77
+ .tag("amount", Tag.inserting(Component.text(comments.length)))
78
+ .tag("cur", Tag.inserting(Component.text(page + 1)))
79
+ .tag("max", Tag.inserting(Component.text(totalPages + 1)))
80
+ .tag("word", Tag.inserting(Component.text("all")))
81
+ .build()
77
82
  ));
78
83
 
79
84
  // This might work xD
80
85
  for (int x = page * 12; x < max; x++) {
81
86
  PlotComment comment = comments[x];
82
87
  Component commentColored;
83
- if (player.getName().equals(comment.senderName)) {
88
+ if (player.getName().equals(comment.senderName())) {
84
89
  commentColored = MINI_MESSAGE
85
- .parse(
90
+ .deserialize(
86
91
  TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
87
- Template.of("comment", comment.comment)
92
+ TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
88
93
  );
89
94
  } else {
90
95
  commentColored = MINI_MESSAGE
91
- .parse(
96
+ .deserialize(
92
97
  TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
93
- Template.of("comment", comment.comment)
98
+ TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
94
99
  );
95
100
  }
96
- Template number = Template.of("number", String.valueOf(x));
97
- Template world = Template.of("world", comment.world);
98
- Template plot_id = Template.of("plot_id", comment.id.getX() + ";" + comment.id.getY());
99
- Template commenter = Template.of("commenter", comment.senderName);
100
- Template commentTemplate = Template.of("comment", commentColored);
101
+ TagResolver resolver = TagResolver.builder()
102
+ .tag("number", Tag.inserting(Component.text(x)))
103
+ .tag("world", Tag.inserting(Component.text(comment.world())))
104
+ .tag("plot_id", Tag.inserting(Component.text(comment.id().getX() + ";" + comment.id().getY())))
105
+ .tag("commenter", Tag.inserting(Component.text(comment.senderName())))
106
+ .tag("comment", Tag.inserting(commentColored))
107
+ .build();
101
108
  builder.append(MINI_MESSAGE
102
- .parse(
109
+ .deserialize(
103
110
  TranslatableCaption.of("list.comment_list_comment").getComponent(player),
104
- number,
105
- world,
106
- plot_id,
107
- commenter,
108
- commentTemplate
111
+ resolver
109
112
  ));
110
113
  }
111
114
  player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
@@ -134,7 +137,7 @@ public class Inbox extends SubCommand {
134
137
  int unread = 0;
135
138
  for (PlotComment comment : value) {
136
139
  total++;
137
- if (comment.timestamp > CommentManager
140
+ if (comment.timestamp() > CommentManager
138
141
  .getTimestamp(player, inbox.toString())) {
139
142
  unread++;
140
143
  }
@@ -142,20 +145,23 @@ public class Inbox extends SubCommand {
142
145
  if (total != 0) {
143
146
  player.sendMessage(
144
147
  TranslatableCaption.of("comment.inbox_item"),
145
- Template.of("value", inbox + " (" + total + '/' + unread + ')')
148
+ TagResolver.resolver(
149
+ "value",
150
+ Tag.inserting(Component.text(inbox + " (" + total + '/' + unread + ')'))
151
+ )
146
152
  );
147
153
  return;
148
154
  }
149
155
  }
150
156
  player.sendMessage(
151
157
  TranslatableCaption.of("comment.inbox_item"),
152
- Template.of("value", inbox.toString())
158
+ TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
153
159
  );
154
160
  }
155
161
  })) {
156
162
  player.sendMessage(
157
163
  TranslatableCaption.of("comment.inbox_item"),
158
- Template.of("value", inbox.toString())
164
+ TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
159
165
  );
160
166
  }
161
167
  }
@@ -166,7 +172,10 @@ public class Inbox extends SubCommand {
166
172
  if (inbox == null) {
167
173
  player.sendMessage(
168
174
  TranslatableCaption.of("comment.invalid_inbox"),
169
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), ", "))
175
+ TagResolver.resolver(
176
+ "list",
177
+ Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), ", ")))
178
+ )
170
179
  );
171
180
  return false;
172
181
  }
@@ -181,7 +190,7 @@ public class Inbox extends SubCommand {
181
190
  final int page;
182
191
  if (args.length > 1) {
183
192
  switch (args[1].toLowerCase()) {
184
- case "delete":
193
+ case "delete" -> {
185
194
  if (!inbox.canModify(plot, player)) {
186
195
  player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
187
196
  return false;
@@ -189,7 +198,10 @@ public class Inbox extends SubCommand {
189
198
  if (args.length != 3) {
190
199
  player.sendMessage(
191
200
  TranslatableCaption.of("commandconfig.command_syntax"),
192
- Template.of("value", "/plot inbox " + inbox + " delete <index>")
201
+ TagResolver.resolver(
202
+ "value",
203
+ Tag.inserting(Component.text("/plot inbox " + inbox + " delete <index>"))
204
+ )
193
205
  );
194
206
  return true;
195
207
  }
@@ -199,25 +211,27 @@ public class Inbox extends SubCommand {
199
211
  if (index < 1) {
200
212
  player.sendMessage(
201
213
  TranslatableCaption.of("comment.not_valid_inbox_index"),
202
- Templates.of("number", index)
214
+ TagResolver.resolver("number", Tag.inserting(Component.text(index)))
203
215
  );
204
216
  return false;
205
217
  }
206
218
  } catch (NumberFormatException ignored) {
207
219
  player.sendMessage(
208
220
  TranslatableCaption.of("commandconfig.command_syntax"),
209
- Template.of("value", "/plot inbox " + inbox + " delete <index>")
221
+ TagResolver.resolver(
222
+ "value",
223
+ Tag.inserting(Component.text("/plot inbox " + inbox + " delete <index>"))
224
+ )
210
225
  );
211
226
  return false;
212
227
  }
213
-
214
228
  if (!inbox.getComments(plot, new RunnableVal<>() {
215
229
  @Override
216
230
  public void run(List<PlotComment> value) {
217
231
  if (index > value.size()) {
218
232
  player.sendMessage(
219
233
  TranslatableCaption.of("comment.not_valid_inbox_index"),
220
- Templates.of("number", index)
234
+ TagResolver.resolver("number", Tag.inserting(Component.text(index)))
221
235
  );
222
236
  return;
223
237
  }
@@ -227,7 +241,7 @@ public class Inbox extends SubCommand {
227
241
  if (success) {
228
242
  player.sendMessage(
229
243
  TranslatableCaption.of("comment.comment_removed_success"),
230
- Template.of("value", comment.comment)
244
+ TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment())))
231
245
  );
232
246
  } else {
233
247
  player.sendMessage(
@@ -239,7 +253,8 @@ public class Inbox extends SubCommand {
239
253
  return false;
240
254
  }
241
255
  return true;
242
- case "clear":
256
+ }
257
+ case "clear" -> {
243
258
  if (!inbox.canModify(plot, player)) {
244
259
  player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
245
260
  }
@@ -248,18 +263,20 @@ public class Inbox extends SubCommand {
248
263
  if (!comments.isEmpty()) {
249
264
  player.sendMessage(
250
265
  TranslatableCaption.of("comment.comment_removed_success"),
251
- Template.of("value", String.valueOf(comments))
266
+ TagResolver.resolver("value", Tag.inserting(Component.text("*")))
252
267
  );
253
268
  plot.getPlotCommentContainer().removeComments(comments);
254
269
  }
255
270
  return true;
256
- default:
271
+ }
272
+ default -> {
257
273
  try {
258
274
  page = Integer.parseInt(args[1]);
259
275
  } catch (NumberFormatException ignored) {
260
276
  sendUsage(player);
261
277
  return false;
262
278
  }
279
+ }
263
280
  }
264
281
  } else {
265
282
  page = 1;
Core/src/main/java/com/plotsquared/core/command/Info.java CHANGED
@@ -28,7 +28,9 @@ import com.plotsquared.core.player.PlotPlayer;
28
28
  import com.plotsquared.core.plot.Plot;
29
29
  import com.plotsquared.core.plot.flag.implementations.HideInfoFlag;
30
30
  import com.plotsquared.core.util.TabCompletions;
31
- import net.kyori.adventure.text.minimessage.Template;
31
+ import net.kyori.adventure.text.Component;
32
+ import net.kyori.adventure.text.minimessage.tag.Tag;
33
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
32
34
 
33
35
  import java.util.Collection;
34
36
  import java.util.Collections;
@@ -50,8 +52,9 @@ public class Info extends SubCommand {
50
52
  arg = args[0];
51
53
  switch (arg) {
52
54
  // TODO: (re?)implement /plot info inv. (it was never properly implemented)
53
- case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" -> plot = Plot
54
- .getPlotFromString(player, null, false);
55
+ case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" ->
56
+ plot = Plot
57
+ .getPlotFromString(player, null, false);
55
58
  default -> {
56
59
  plot = Plot.getPlotFromString(player, arg, false);
57
60
  if (args.length == 2) {
@@ -90,7 +93,10 @@ public class Info extends SubCommand {
90
93
  .hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) {
91
94
  player.sendMessage(
92
95
  TranslatableCaption.of("permission.no_permission"),
93
- Template.of("node", Permission.PERMISSION_AREA_INFO_FORCE.toString())
96
+ TagResolver.resolver(
97
+ "node",
98
+ Tag.inserting(Permission.PERMISSION_AREA_INFO_FORCE)
99
+ )
94
100
  );
95
101
  return true;
96
102
  }
@@ -112,7 +118,10 @@ public class Info extends SubCommand {
112
118
  if (!hasOwner && !containsEveryone && !trustedEveryone) {
113
119
  player.sendMessage(
114
120
  TranslatableCaption.of("info.plot_info_unclaimed"),
115
- Template.of("plot", plot.getId().getX() + ";" + plot.getId().getY())
121
+ TagResolver.resolver(
122
+ "plot",
123
+ Tag.inserting(Component.text(plot.getId().getX() + ";" + plot.getId().getY()))
124
+ )
116
125
  );
117
126
  return true;
118
127
  }
Core/src/main/java/com/plotsquared/core/command/Kick.java CHANGED
@@ -30,7 +30,9 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
30
30
  import com.plotsquared.core.util.PlayerManager;
31
31
  import com.plotsquared.core.util.TabCompletions;
32
32
  import com.plotsquared.core.util.WorldUtil;
33
- import net.kyori.adventure.text.minimessage.Template;
33
+ import net.kyori.adventure.text.Component;
34
+ import net.kyori.adventure.text.minimessage.tag.Tag;
35
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
34
36
  import org.checkerframework.checker.nullness.qual.NonNull;
35
37
 
36
38
  import java.util.Collection;
@@ -80,7 +82,7 @@ public class Kick extends SubCommand {
80
82
  } else if (throwable != null || uuids.isEmpty()) {
81
83
  player.sendMessage(
82
84
  TranslatableCaption.of("errors.invalid_player"),
83
- Template.of("value", args[0])
85
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
84
86
  );
85
87
  } else {
86
88
  Set<PlotPlayer<?>> players = new HashSet<>();
@@ -103,7 +105,7 @@ public class Kick extends SubCommand {
103
105
  if (players.isEmpty()) {
104
106
  player.sendMessage(
105
107
  TranslatableCaption.of("errors.invalid_player"),
106
- Template.of("value", args[0])
108
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
107
109
  );
108
110
  return;
109
111
  }
@@ -111,14 +113,14 @@ public class Kick extends SubCommand {
111
113
  if (!plot.equals(player2.getCurrentPlot())) {
112
114
  player.sendMessage(
113
115
  TranslatableCaption.of("errors.invalid_player"),
114
- Template.of("value", args[0])
116
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
115
117
  );
116
118
  return;
117
119
  }
118
120
  if (player2.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
119
121
  player.sendMessage(
120
122
  TranslatableCaption.of("cluster.cannot_kick_player"),
121
- Template.of("name", player2.getName())
123
+ TagResolver.resolver("name", Tag.inserting(Component.text(player2.getName())))
122
124
  );
123
125
  return;
124
126
  }
Core/src/main/java/com/plotsquared/core/command/Leave.java CHANGED
@@ -25,7 +25,9 @@ import com.plotsquared.core.plot.Plot;
25
25
  import com.plotsquared.core.util.EventDispatcher;
26
26
  import com.plotsquared.core.util.task.RunnableVal2;
27
27
  import com.plotsquared.core.util.task.RunnableVal3;
28
- import net.kyori.adventure.text.minimessage.Template;
28
+ import net.kyori.adventure.text.Component;
29
+ import net.kyori.adventure.text.minimessage.tag.Tag;
30
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
29
31
  import org.checkerframework.checker.nullness.qual.NonNull;
30
32
 
31
33
  import java.util.UUID;
@@ -67,7 +69,7 @@ public class Leave extends Command {
67
69
  }
68
70
  player.sendMessage(
69
71
  TranslatableCaption.of("member.plot_left"),
70
- Template.of("player", player.getName())
72
+ TagResolver.resolver("player", Tag.inserting(Component.text(player.getName())))
71
73
  );
72
74
  } else {
73
75
  player.sendMessage(
Core/src/main/java/com/plotsquared/core/command/Like.java CHANGED
@@ -33,7 +33,9 @@ import com.plotsquared.core.util.EventDispatcher;
33
33
  import com.plotsquared.core.util.TabCompletions;
34
34
  import com.plotsquared.core.util.query.PlotQuery;
35
35
  import com.plotsquared.core.util.task.TaskManager;
36
- import net.kyori.adventure.text.minimessage.Template;
36
+ import net.kyori.adventure.text.Component;
37
+ import net.kyori.adventure.text.minimessage.tag.Tag;
38
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
37
39
  import org.checkerframework.checker.nullness.qual.NonNull;
38
40
 
39
41
  import java.util.Collection;
@@ -151,7 +153,7 @@ public class Like extends SubCommand {
151
153
  if (oldRating != null) {
152
154
  player.sendMessage(
153
155
  TranslatableCaption.of("ratings.rating_already_exists"),
154
- Template.of("plot", plot.getId().toString())
156
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
155
157
  );
156
158
  return;
157
159
  }
@@ -169,12 +171,12 @@ public class Like extends SubCommand {
169
171
  if (like) {
170
172
  player.sendMessage(
171
173
  TranslatableCaption.of("ratings.rating_liked"),
172
- Template.of("plot", plot.getId().toString())
174
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
173
175
  );
174
176
  } else {
175
177
  player.sendMessage(
176
178
  TranslatableCaption.of("ratings.rating_disliked"),
177
- Template.of("plot", plot.getId().toString())
179
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
178
180
  );
179
181
  }
180
182
  }
Core/src/main/java/com/plotsquared/core/command/ListCmd.java CHANGED
@@ -23,7 +23,6 @@ import com.plotsquared.core.PlotSquared;
23
23
  import com.plotsquared.core.configuration.Settings;
24
24
  import com.plotsquared.core.configuration.caption.Caption;
25
25
  import com.plotsquared.core.configuration.caption.CaptionHolder;
26
- import com.plotsquared.core.configuration.caption.Templates;
27
26
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
28
27
  import com.plotsquared.core.database.DBFunc;
29
28
  import com.plotsquared.core.permissions.Permission;
@@ -46,7 +45,8 @@ import com.plotsquared.core.util.task.RunnableVal3;
46
45
  import com.plotsquared.core.uuid.UUIDMapping;
47
46
  import net.kyori.adventure.text.Component;
48
47
  import net.kyori.adventure.text.TextComponent;
49
- import net.kyori.adventure.text.minimessage.Template;
48
+ import net.kyori.adventure.text.minimessage.tag.Tag;
49
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
50
50
  import org.checkerframework.checker.nullness.qual.NonNull;
51
51
 
52
52
  import java.util.ArrayList;
@@ -123,7 +123,7 @@ public class ListCmd extends SubCommand {
123
123
  public void noArgs(PlotPlayer<?> player) {
124
124
  player.sendMessage(
125
125
  TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
126
- Templates.of("values", Arrays.toString(getArgumentList(player)))
126
+ TagResolver.resolver("values", Tag.inserting(Component.text(Arrays.toString(getArgumentList(player)))))
127
127
  );
128
128
  }
129
129
 
@@ -159,9 +159,14 @@ public class ListCmd extends SubCommand {
159
159
  if (query == null) {
160
160
  player.sendMessage(
161
161
  TranslatableCaption.of("commandconfig.did_you_mean"),
162
- Template.of(
162
+ TagResolver.resolver(
163
163
  "value",
164
- new StringComparison<>(args[0], new String[]{"mine", "shared", "world", "all"}).getBestMatch()
164
+ Tag.inserting(Component.text(
165
+ new StringComparison<>(
166
+ args[0],
167
+ new String[]{"mine", "shared", "world", "all"}
168
+ ).getBestMatch()
169
+ ))
165
170
  )
166
171
  );
167
172
  return;
@@ -189,7 +194,7 @@ public class ListCmd extends SubCommand {
189
194
  if (!player.hasPermission(Permission.PERMISSION_LIST_MINE)) {
190
195
  player.sendMessage(
191
196
  TranslatableCaption.of("permission.no_permission"),
192
- Templates.of("node", "plots.list.mine")
197
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.mine")))
193
198
  );
194
199
  return false;
195
200
  }
@@ -204,7 +209,7 @@ public class ListCmd extends SubCommand {
204
209
  if (!player.hasPermission(Permission.PERMISSION_LIST_SHARED)) {
205
210
  player.sendMessage(
206
211
  TranslatableCaption.of("permission.no_permission"),
207
- Templates.of("node", "plots.list.shared")
212
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.shared")))
208
213
  );
209
214
  return false;
210
215
  }
@@ -217,14 +222,14 @@ public class ListCmd extends SubCommand {
217
222
  if (!player.hasPermission(Permission.PERMISSION_LIST_WORLD)) {
218
223
  player.sendMessage(
219
224
  TranslatableCaption.of("permission.no_permission"),
220
- Templates.of("node", "plots.list.world")
225
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
221
226
  );
222
227
  return false;
223
228
  }
224
229
  if (!player.hasPermission("plots.list.world." + world)) {
225
230
  player.sendMessage(
226
231
  TranslatableCaption.of("permission.no_permission"),
227
- Templates.of("node", "plots.list.world." + world)
232
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
228
233
  );
229
234
  return false;
230
235
  }
@@ -234,7 +239,7 @@ public class ListCmd extends SubCommand {
234
239
  if (!player.hasPermission(Permission.PERMISSION_LIST_EXPIRED)) {
235
240
  player.sendMessage(
236
241
  TranslatableCaption.of("permission.no_permission"),
237
- Templates.of("node", "plots.list.expired")
242
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.expired")))
238
243
  );
239
244
  return false;
240
245
  }
@@ -248,14 +253,14 @@ public class ListCmd extends SubCommand {
248
253
  if (!player.hasPermission(Permission.PERMISSION_LIST_AREA)) {
249
254
  player.sendMessage(
250
255
  TranslatableCaption.of("permission.no_permission"),
251
- Templates.of("node", "plots.list.area")
256
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.area")))
252
257
  );
253
258
  return false;
254
259
  }
255
260
  if (!player.hasPermission("plots.list.world." + world)) {
256
261
  player.sendMessage(
257
262
  TranslatableCaption.of("permission.no_permission"),
258
- Templates.of("node", "plots.list.world." + world)
263
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
259
264
  );
260
265
  return false;
261
266
  }
@@ -269,7 +274,7 @@ public class ListCmd extends SubCommand {
269
274
  if (!player.hasPermission(Permission.PERMISSION_LIST_ALL)) {
270
275
  player.sendMessage(
271
276
  TranslatableCaption.of("permission.no_permission"),
272
- Templates.of("node", "plots.list.all")
277
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.all")))
273
278
  );
274
279
  return false;
275
280
  }
@@ -279,7 +284,7 @@ public class ListCmd extends SubCommand {
279
284
  if (!player.hasPermission(Permission.PERMISSION_LIST_DONE)) {
280
285
  player.sendMessage(
281
286
  TranslatableCaption.of("permission.no_permission"),
282
- Templates.of("node", "plots.list.done")
287
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.done")))
283
288
  );
284
289
  return false;
285
290
  }
@@ -294,7 +299,7 @@ public class ListCmd extends SubCommand {
294
299
  if (!player.hasPermission(Permission.PERMISSION_LIST_TOP)) {
295
300
  player.sendMessage(
296
301
  TranslatableCaption.of("permission.no_permission"),
297
- Templates.of("node", "plots.list.top")
302
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.top")))
298
303
  );
299
304
  return false;
300
305
  }
@@ -305,7 +310,7 @@ public class ListCmd extends SubCommand {
305
310
  if (!player.hasPermission(Permission.PERMISSION_LIST_FOR_SALE)) {
306
311
  player.sendMessage(
307
312
  TranslatableCaption.of("permission.no_permission"),
308
- Templates.of("node", "plots.list.forsale")
313
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.forsale")))
309
314
  );
310
315
  return false;
311
316
  }
@@ -318,7 +323,7 @@ public class ListCmd extends SubCommand {
318
323
  if (!player.hasPermission(Permission.PERMISSION_LIST_UNOWNED)) {
319
324
  player.sendMessage(
320
325
  TranslatableCaption.of("permission.no_permission"),
321
- Templates.of("node", "plots.list.unowned")
326
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.unowned")))
322
327
  );
323
328
  return false;
324
329
  }
@@ -328,14 +333,14 @@ public class ListCmd extends SubCommand {
328
333
  if (!player.hasPermission(Permission.PERMISSION_LIST_FUZZY)) {
329
334
  player.sendMessage(
330
335
  TranslatableCaption.of("permission.no_permission"),
331
- Templates.of("node", "plots.list.fuzzy")
336
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.fuzzy")))
332
337
  );
333
338
  return false;
334
339
  }
335
340
  if (args.length < (page == -1 ? 2 : 3)) {
336
341
  player.sendMessage(
337
342
  TranslatableCaption.of("commandconfig.command_syntax"),
338
- Templates.of("value", "/plot list fuzzy <search...> [#]")
343
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot list fuzzy <search...> [#]")))
339
344
  );
340
345
  return false;
341
346
  }
@@ -353,14 +358,14 @@ public class ListCmd extends SubCommand {
353
358
  if (!player.hasPermission(Permission.PERMISSION_LIST_WORLD)) {
354
359
  player.sendMessage(
355
360
  TranslatableCaption.of("permission.no_permission"),
356
- Templates.of("node", "plots.list.world")
361
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
357
362
  );
358
363
  return false;
359
364
  }
360
365
  if (!player.hasPermission("plots.list.world." + args[0])) {
361
366
  player.sendMessage(
362
367
  TranslatableCaption.of("permission.no_permission"),
363
- Templates.of("node", "plots.list.world." + args[0])
368
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + args[0])))
364
369
  );
365
370
  return false;
366
371
  }
@@ -379,12 +384,15 @@ public class ListCmd extends SubCommand {
379
384
  }
380
385
  }
381
386
  if (uuid == null) {
382
- player.sendMessage(TranslatableCaption.of("errors.invalid_player"), Templates.of("value", args[0]));
387
+ player.sendMessage(
388
+ TranslatableCaption.of("errors.invalid_player"),
389
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
390
+ );
383
391
  } else {
384
392
  if (!player.hasPermission(Permission.PERMISSION_LIST_PLAYER)) {
385
393
  player.sendMessage(
386
394
  TranslatableCaption.of("permission.no_permission"),
387
- Templates.of("node", "plots.list.player")
395
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.player")))
388
396
  );
389
397
  } else {
390
398
  sort[0] = false;
@@ -420,32 +428,34 @@ public class ListCmd extends SubCommand {
420
428
  } else {
421
429
  color = TranslatableCaption.of("info.plot_list_default");
422
430
  }
423
- Component trusted = MINI_MESSAGE.parse(
431
+ Component trusted = MINI_MESSAGE.deserialize(
424
432
  TranslatableCaption.of("info.plot_info_trusted").getComponent(player),
425
- Template.of("trusted", PlayerManager.getPlayerList(plot.getTrusted(), player))
433
+ TagResolver.resolver("trusted", Tag.inserting(PlayerManager.getPlayerList(plot.getTrusted(), player)))
426
434
  );
427
- Component members = MINI_MESSAGE.parse(
435
+ Component members = MINI_MESSAGE.deserialize(
428
436
  TranslatableCaption.of("info.plot_info_members").getComponent(player),
429
- Template.of("members", PlayerManager.getPlayerList(plot.getMembers(), player))
437
+ TagResolver.resolver("members", Tag.inserting(PlayerManager.getPlayerList(plot.getMembers(), player)))
430
438
  );
431
- Template command_tp = Template.of("command_tp", "/plot visit " + plot.getArea() + ";" + plot.getId());
432
- Template command_info = Template.of("command_info", "/plot info " + plot.getArea() + ";" + plot.getId());
433
- Template hover_info =
434
- Template.of(
435
- "hover_info",
436
- MINI_MESSAGE.serialize(Component
437
- .text()
438
- .append(trusted)
439
- .append(Component.newline())
440
- .append(members)
441
- .asComponent())
442
- );
443
- Template numberTemplate = Template.of("number", String.valueOf(i));
444
- Template plotTemplate = Template.of(
445
- "plot",
446
- MINI_MESSAGE.parse(color.getComponent(player), Template.of("plot", plot.toString()))
439
+ TagResolver.Builder finalResolver = TagResolver.builder();
440
+ finalResolver.tag(
441
+ "command_tp",
442
+ Tag.preProcessParsed("/plot visit " + plot.getArea() + ";" + plot.getId())
447
443
  );
448
-
444
+ finalResolver.tag(
445
+ "command_info",
446
+ Tag.preProcessParsed("/plot info " + plot.getArea() + ";" + plot.getId())
447
+ );
448
+ finalResolver.tag("hover_info", Tag.inserting(
449
+ Component.text()
450
+ .append(trusted)
451
+ .append(Component.newline())
452
+ .append(members)
453
+ .asComponent()
454
+ ));
455
+ finalResolver.tag("number", Tag.inserting(Component.text(i)));
456
+ finalResolver.tag("plot", Tag.inserting(MINI_MESSAGE.deserialize(
457
+ color.getComponent(player), TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
458
+ )));
449
459
  String prefix = "";
450
460
  String online = TranslatableCaption.of("info.plot_list_player_online").getComponent(player);
451
461
  String offline = TranslatableCaption.of("info.plot_list_player_offline").getComponent(player);
@@ -454,35 +464,37 @@ public class ListCmd extends SubCommand {
454
464
  String everyone = TranslatableCaption.of("info.plot_list_player_everyone").getComponent(player);
455
465
  TextComponent.Builder builder = Component.text();
456
466
  if (plot.getFlag(ServerPlotFlag.class)) {
457
- Template serverTemplate = Template.of(
467
+ TagResolver serverResolver = TagResolver.resolver(
458
468
  "info.server",
459
- TranslatableCaption.of("info.server").getComponent(player)
469
+ Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
460
470
  );
461
- builder.append(MINI_MESSAGE.parse(server, serverTemplate));
471
+ builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
462
472
  } else {
463
473
  try {
464
474
  final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
465
475
  .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
466
476
  for (final UUIDMapping uuidMapping : names) {
467
- PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
468
- Template prefixTemplate = Template.of("prefix", prefix);
469
- Template playerTemplate = Template.of("player", uuidMapping.getUsername());
477
+ PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.uuid());
478
+ TagResolver resolver = TagResolver.builder()
479
+ .tag("prefix", Tag.inserting(Component.text(prefix)))
480
+ .tag("player", Tag.inserting(Component.text(uuidMapping.username())))
481
+ .build();
470
482
  if (pp != null) {
471
- builder.append(MINI_MESSAGE.parse(online, prefixTemplate, playerTemplate));
472
- } else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
473
- Template unknownTemplate = Template.of(
483
+ builder.append(MINI_MESSAGE.deserialize(online, resolver));
484
+ } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
485
+ TagResolver unknownResolver = TagResolver.resolver(
474
486
  "info.unknown",
475
- TranslatableCaption.of("info.unknown").getComponent(player)
487
+ Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
476
488
  );
477
- builder.append(MINI_MESSAGE.parse(unknown, unknownTemplate));
478
- } else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
479
- Template everyoneTemplate = Template.of(
489
+ builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
490
+ } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
491
+ TagResolver everyoneResolver = TagResolver.resolver(
480
492
  "info.everyone",
481
- TranslatableCaption.of("info.everyone").getComponent(player)
493
+ Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
482
494
  );
483
- builder.append(MINI_MESSAGE.parse(everyone, everyoneTemplate));
495
+ builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));
484
496
  } else {
485
- builder.append(MINI_MESSAGE.parse(offline, prefixTemplate, playerTemplate));
497
+ builder.append(MINI_MESSAGE.deserialize(offline, resolver));
486
498
  }
487
499
  prefix = ", ";
488
500
  }
@@ -498,15 +510,15 @@ public class ListCmd extends SubCommand {
498
510
  }
499
511
  player.sendMessage(
500
512
  TranslatableCaption.of("errors.invalid_player"),
501
- Templates.of("value", playerBuilder.toString())
513
+ TagResolver.resolver("value", Tag.inserting(Component.text(playerBuilder.toString())))
502
514
  );
503
515
  } catch (TimeoutException e) {
504
516
  player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
505
517
  }
506
518
  }
507
- Template players = Template.of("players", builder.asComponent());
519
+ finalResolver.tag("players", Tag.inserting(builder.asComponent()));
508
520
  caption.set(TranslatableCaption.of("info.plot_list_item"));
509
- caption.setTemplates(command_tp, command_info, hover_info, numberTemplate, plotTemplate, players);
521
+ caption.setTagResolvers(finalResolver.build());
510
522
  }
511
523
  }, "/plot list " + args[0], TranslatableCaption.of("list.plot_list_header_paged"));
512
524
  }
Core/src/main/java/com/plotsquared/core/command/Load.java CHANGED
@@ -35,7 +35,9 @@ import com.plotsquared.core.util.SchematicHandler;
35
35
  import com.plotsquared.core.util.TimeUtil;
36
36
  import com.plotsquared.core.util.task.RunnableVal;
37
37
  import com.plotsquared.core.util.task.TaskManager;
38
- import net.kyori.adventure.text.minimessage.Template;
38
+ import net.kyori.adventure.text.Component;
39
+ import net.kyori.adventure.text.minimessage.tag.Tag;
40
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
39
41
  import org.checkerframework.checker.nullness.qual.NonNull;
40
42
 
41
43
  import java.net.MalformedURLException;
@@ -97,7 +99,7 @@ public class Load extends SubCommand {
97
99
  // No schematics found:
98
100
  player.sendMessage(
99
101
  TranslatableCaption.of("web.load_null"),
100
- Template.of("command", "/plot load")
102
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot load")))
101
103
  );
102
104
  return false;
103
105
  }
@@ -108,7 +110,7 @@ public class Load extends SubCommand {
108
110
  // use /plot load <index>
109
111
  player.sendMessage(
110
112
  TranslatableCaption.of("invalid.not_valid_number"),
111
- Template.of("value", "(1, " + schematics.size() + ')')
113
+ TagResolver.resolver("value", Tag.inserting(Component.text("(1, " + schematics.size() + ')')))
112
114
  );
113
115
  return false;
114
116
  }
@@ -128,7 +130,10 @@ public class Load extends SubCommand {
128
130
  plot.removeRunning();
129
131
  player.sendMessage(
130
132
  TranslatableCaption.of("schematics.schematic_invalid"),
131
- Template.of("reason", "non-existent or not in gzip format")
133
+ TagResolver.resolver(
134
+ "reason",
135
+ Tag.inserting(Component.text("non-existent or not in gzip format"))
136
+ )
132
137
  );
133
138
  return;
134
139
  }
@@ -159,7 +164,7 @@ public class Load extends SubCommand {
159
164
  plot.removeRunning();
160
165
  player.sendMessage(
161
166
  TranslatableCaption.of("commandconfig.command_syntax"),
162
- Template.of("value", "/plot load <index>")
167
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot load <index>")))
163
168
  );
164
169
  return false;
165
170
  }
@@ -210,46 +215,9 @@ public class Load extends SubCommand {
210
215
  }
211
216
  player.sendMessage(
212
217
  TranslatableCaption.of("web.load_list"),
213
- Template.of("command", "/plot load #")
218
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot load #")))
214
219
  );
215
220
  }
216
221
  }
217
222
 
218
- /**
219
- * @deprecated Use {@link TimeUtil#secToTime(long)}
220
- */
221
- @Deprecated(forRemoval = true, since = "6.6.2")
222
- public String secToTime(long time) {
223
- StringBuilder toreturn = new StringBuilder();
224
- if (time >= 33868800) {
225
- int years = (int) (time / 33868800);
226
- time -= years * 33868800;
227
- toreturn.append(years).append("y ");
228
- }
229
- if (time >= 604800) {
230
- int weeks = (int) (time / 604800);
231
- time -= weeks * 604800;
232
- toreturn.append(weeks).append("w ");
233
- }
234
- if (time >= 86400) {
235
- int days = (int) (time / 86400);
236
- time -= days * 86400;
237
- toreturn.append(days).append("d ");
238
- }
239
- if (time >= 3600) {
240
- int hours = (int) (time / 3600);
241
- time -= hours * 3600;
242
- toreturn.append(hours).append("h ");
243
- }
244
- if (time >= 60) {
245
- int minutes = (int) (time / 60);
246
- time -= minutes * 60;
247
- toreturn.append(minutes).append("m ");
248
- }
249
- if (toreturn.length() == 0 || (time > 0)) {
250
- toreturn.append(time).append("s ");
251
- }
252
- return toreturn.toString().trim();
253
- }
254
-
255
223
  }
Core/src/main/java/com/plotsquared/core/command/MainCommand.java CHANGED
@@ -35,6 +35,9 @@ import com.plotsquared.core.util.EconHandler;
35
35
  import com.plotsquared.core.util.PlotExpression;
36
36
  import com.plotsquared.core.util.task.RunnableVal2;
37
37
  import com.plotsquared.core.util.task.RunnableVal3;
38
+ import net.kyori.adventure.text.Component;
39
+ import net.kyori.adventure.text.minimessage.tag.Tag;
40
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
38
41
  import org.apache.logging.log4j.LogManager;
39
42
  import org.apache.logging.log4j.Logger;
40
43
 
@@ -71,7 +74,6 @@ public class MainCommand extends Command {
71
74
  commands.add(Buy.class);
72
75
  if (Settings.Web.LEGACY_WEBINTERFACE) {
73
76
  LOGGER.warn("Legacy webinterface is used. Please note that it will be removed in future.");
74
- commands.add(Save.class);
75
77
  }
76
78
  commands.add(Load.class);
77
79
  commands.add(Confirm.class);
@@ -120,7 +122,6 @@ public class MainCommand extends Command {
120
122
  commands.add(Move.class);
121
123
  commands.add(Condense.class);
122
124
  commands.add(Copy.class);
123
- commands.add(Chat.class);
124
125
  commands.add(Trim.class);
125
126
  commands.add(Done.class);
126
127
  commands.add(Continue.class);
@@ -310,7 +311,7 @@ public class MainCommand extends Command {
310
311
  if (message != null) {
311
312
  player.sendMessage(
312
313
  TranslatableCaption.of("errors.error"),
313
- net.kyori.adventure.text.minimessage.Template.of("value", message)
314
+ TagResolver.resolver("value", Tag.inserting(Component.text(message)))
314
315
  );
315
316
  } else {
316
317
  player.sendMessage(
Core/src/main/java/com/plotsquared/core/command/Merge.java CHANGED
@@ -34,7 +34,9 @@ import com.plotsquared.core.util.EconHandler;
34
34
  import com.plotsquared.core.util.EventDispatcher;
35
35
  import com.plotsquared.core.util.PlotExpression;
36
36
  import com.plotsquared.core.util.StringMan;
37
- import net.kyori.adventure.text.minimessage.Template;
37
+ import net.kyori.adventure.text.Component;
38
+ import net.kyori.adventure.text.minimessage.tag.Tag;
39
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
38
40
  import org.checkerframework.checker.nullness.qual.NonNull;
39
41
 
40
42
  import java.util.UUID;
@@ -114,11 +116,13 @@ public class Merge extends SubCommand {
114
116
  if (direction == null) {
115
117
  player.sendMessage(
116
118
  TranslatableCaption.of("commandconfig.command_syntax"),
117
- Template.of("value", "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]")
119
+ TagResolver.resolver("value", Tag.inserting(Component.text(
120
+ "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
121
+ )))
118
122
  );
119
123
  player.sendMessage(
120
124
  TranslatableCaption.of("help.direction"),
121
- Template.of("dir", direction(location.getYaw()))
125
+ TagResolver.resolver("dir", Tag.inserting(Component.text(direction(location.getYaw()))))
122
126
  );
123
127
  return false;
124
128
  }
@@ -129,7 +133,7 @@ public class Merge extends SubCommand {
129
133
  if (event.getEventResult() == Result.DENY) {
130
134
  player.sendMessage(
131
135
  TranslatableCaption.of("events.event_denied"),
132
- Template.of("value", "Merge")
136
+ TagResolver.resolver("value", Tag.inserting(Component.text("Merge")))
133
137
  );
134
138
  return false;
135
139
  }
@@ -140,7 +144,7 @@ public class Merge extends SubCommand {
140
144
  if (!force && size - 1 > maxSize) {
141
145
  player.sendMessage(
142
146
  TranslatableCaption.of("permission.no_permission"),
143
- Template.of("node", Permission.PERMISSION_MERGE + "." + (size + 1))
147
+ TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_MERGE + "." + (size + 1))))
144
148
  );
145
149
  return false;
146
150
  }
@@ -166,7 +170,10 @@ public class Merge extends SubCommand {
166
170
  if (!force && !terrain && !player.hasPermission(Permission.PERMISSION_MERGE_KEEP_ROAD)) {
167
171
  player.sendMessage(
168
172
  TranslatableCaption.of("permission.no_permission"),
169
- Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
173
+ TagResolver.resolver(
174
+ "node",
175
+ Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD)
176
+ )
170
177
  );
171
178
  return true;
172
179
  }
@@ -175,8 +182,11 @@ public class Merge extends SubCommand {
175
182
  this.econHandler.withdrawMoney(player, price);
176
183
  player.sendMessage(
177
184
  TranslatableCaption.of("economy.removed_balance"),
178
- Template.of("money", this.econHandler.format(price)),
179
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
185
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price)))),
186
+ TagResolver.resolver(
187
+ "balance",
188
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
189
+ )
180
190
  );
181
191
  }
182
192
  player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@@ -190,7 +200,7 @@ public class Merge extends SubCommand {
190
200
  && this.econHandler.getMoney(player) < price) {
191
201
  player.sendMessage(
192
202
  TranslatableCaption.of("economy.cannot_afford_merge"),
193
- Template.of("money", this.econHandler.format(price))
203
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
194
204
  );
195
205
  return false;
196
206
  }
@@ -203,7 +213,7 @@ public class Merge extends SubCommand {
203
213
  if (!force && !terrain && !player.hasPermission(Permission.PERMISSION_MERGE_KEEP_ROAD)) {
204
214
  player.sendMessage(
205
215
  TranslatableCaption.of("permission.no_permission"),
206
- Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
216
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD))
207
217
  );
208
218
  return true;
209
219
  }
@@ -212,7 +222,7 @@ public class Merge extends SubCommand {
212
222
  this.econHandler.withdrawMoney(player, price);
213
223
  player.sendMessage(
214
224
  TranslatableCaption.of("economy.removed_balance"),
215
- Template.of("money", this.econHandler.format(price))
225
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
216
226
  );
217
227
  }
218
228
  player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@@ -228,7 +238,7 @@ public class Merge extends SubCommand {
228
238
  if (!force && !player.hasPermission(Permission.PERMISSION_MERGE_OTHER)) {
229
239
  player.sendMessage(
230
240
  TranslatableCaption.of("permission.no_permission"),
231
- Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_OTHER))
241
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_OTHER))
232
242
  );
233
243
  return false;
234
244
  }
@@ -253,14 +263,14 @@ public class Merge extends SubCommand {
253
263
  if (!force && this.econHandler.getMoney(player) < price) {
254
264
  player.sendMessage(
255
265
  TranslatableCaption.of("economy.cannot_afford_merge"),
256
- Template.of("money", this.econHandler.format(price))
266
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
257
267
  );
258
268
  return;
259
269
  }
260
270
  this.econHandler.withdrawMoney(player, price);
261
271
  player.sendMessage(
262
272
  TranslatableCaption.of("economy.removed_balance"),
263
- Template.of("money", this.econHandler.format(price))
273
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
264
274
  );
265
275
  }
266
276
  player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@@ -268,10 +278,15 @@ public class Merge extends SubCommand {
268
278
  };
269
279
  if (!force && hasConfirmation(player)) {
270
280
  CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
271
- .parse(
281
+ .deserialize(
272
282
  TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
273
- Template.of("player", player.getName()),
274
- Template.of("location", plot.getWorldName() + ";" + plot.getId())
283
+ TagResolver.builder()
284
+ .tag("player", Tag.inserting(Component.text(player.getName())))
285
+ .tag(
286
+ "location",
287
+ Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
288
+ )
289
+ .build()
275
290
  )),
276
291
  run
277
292
  );
@@ -292,14 +307,14 @@ public class Merge extends SubCommand {
292
307
  if (!force && this.econHandler.getMoney(player) < price) {
293
308
  player.sendMessage(
294
309
  TranslatableCaption.of("economy.cannot_afford_merge"),
295
- Template.of("money", this.econHandler.format(price))
310
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
296
311
  );
297
312
  return false;
298
313
  }
299
314
  this.econHandler.withdrawMoney(player, price);
300
315
  player.sendMessage(
301
316
  TranslatableCaption.of("economy.removed_balance"),
302
- Template.of("money", this.econHandler.format(price))
317
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
303
318
  );
304
319
  }
305
320
  player.sendMessage(TranslatableCaption.of("merge.success_merge"));
Core/src/main/java/com/plotsquared/core/command/Move.java CHANGED
@@ -28,7 +28,9 @@ import com.plotsquared.core.plot.PlotArea;
28
28
  import com.plotsquared.core.plot.world.PlotAreaManager;
29
29
  import com.plotsquared.core.util.task.RunnableVal2;
30
30
  import com.plotsquared.core.util.task.RunnableVal3;
31
- import net.kyori.adventure.text.minimessage.Template;
31
+ import net.kyori.adventure.text.Component;
32
+ import net.kyori.adventure.text.minimessage.tag.Tag;
33
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
32
34
  import org.checkerframework.checker.nullness.qual.NonNull;
33
35
 
34
36
  import java.util.concurrent.CompletableFuture;
@@ -104,8 +106,10 @@ public class Move extends SubCommand {
104
106
  if (result) {
105
107
  player.sendMessage(
106
108
  TranslatableCaption.of("move.move_success"),
107
- Template.of("origin", p1),
108
- Template.of("target", p2)
109
+ TagResolver.builder()
110
+ .tag("origin", Tag.inserting(Component.text(p1)))
111
+ .tag("target", Tag.inserting(Component.text(p2)))
112
+ .build()
109
113
  );
110
114
  return true;
111
115
  } else {
Core/src/main/java/com/plotsquared/core/command/Music.java CHANGED
@@ -35,7 +35,9 @@ import com.plotsquared.core.util.EventDispatcher;
35
35
  import com.plotsquared.core.util.InventoryUtil;
36
36
  import com.sk89q.worldedit.world.item.ItemType;
37
37
  import com.sk89q.worldedit.world.item.ItemTypes;
38
- import net.kyori.adventure.text.minimessage.Template;
38
+ import net.kyori.adventure.text.Component;
39
+ import net.kyori.adventure.text.minimessage.tag.Tag;
40
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
39
41
  import org.checkerframework.checker.nullness.qual.NonNull;
40
42
 
41
43
  import javax.annotation.Nullable;
@@ -54,7 +56,7 @@ public class Music extends SubCommand {
54
56
  .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
55
57
  "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
56
58
  "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
57
- "music_disc_pigstep", "music_disc_5"
59
+ "music_disc_pigstep", "music_disc_5", "music_disc_relic"
58
60
  );
59
61
 
60
62
  private final InventoryUtil inventoryUtil;
@@ -81,7 +83,10 @@ public class Music extends SubCommand {
81
83
  if (!plot.isAdded(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
82
84
  player.sendMessage(
83
85
  TranslatableCaption.of("permission.no_permission"),
84
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_MUSIC_OTHER))
86
+ TagResolver.resolver(
87
+ "node",
88
+ Tag.inserting(Permission.PERMISSION_ADMIN_MUSIC_OTHER)
89
+ )
85
90
  );
86
91
  return true;
87
92
  }
@@ -104,15 +109,17 @@ public class Music extends SubCommand {
104
109
  if (event.getEventResult() == Result.DENY) {
105
110
  getPlayer().sendMessage(
106
111
  TranslatableCaption.of("events.event_denied"),
107
- Template.of("value", "Music removal")
112
+ TagResolver.resolver("value", Tag.inserting(Component.text("Music removal")))
108
113
  );
109
114
  return true;
110
115
  }
111
116
  plot.removeFlag(event.getFlag());
112
117
  getPlayer().sendMessage(
113
118
  TranslatableCaption.of("flag.flag_removed"),
114
- Template.of("flag", "music"),
115
- Template.of("value", "music_disc")
119
+ TagResolver.builder()
120
+ .tag("flag", Tag.inserting(Component.text("music")))
121
+ .tag("value", Tag.inserting(Component.text("music_disc")))
122
+ .build()
116
123
  );
117
124
  } else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) {
118
125
  PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
@@ -121,13 +128,17 @@ public class Music extends SubCommand {
121
128
  if (event.getEventResult() == Result.DENY) {
122
129
  getPlayer().sendMessage(
123
130
  TranslatableCaption.of("events.event_denied"),
124
- Template.of("value", "Music addition")
131
+ TagResolver.resolver("value", Tag.inserting(Component.text("Music addition")))
125
132
  );
126
133
  return true;
127
134
  }
128
135
  plot.setFlag(event.getFlag());
129
- getPlayer().sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", "music"),
130
- Template.of("value", String.valueOf(event.getFlag().getValue()))
136
+ getPlayer().sendMessage(
137
+ TranslatableCaption.of("flag.flag_added"),
138
+ TagResolver.builder()
139
+ .tag("flag", Tag.inserting(Component.text("music")))
140
+ .tag("value", Tag.inserting(Component.text(event.getFlag().getValue().toString())))
141
+ .build()
131
142
  );
132
143
  } else {
133
144
  getPlayer().sendMessage(TranslatableCaption.of("flag.flag_not_added"));
Core/src/main/java/com/plotsquared/core/command/Near.java CHANGED
@@ -24,7 +24,9 @@ import com.plotsquared.core.plot.Plot;
24
24
  import com.plotsquared.core.util.StringMan;
25
25
  import com.plotsquared.core.util.task.RunnableVal2;
26
26
  import com.plotsquared.core.util.task.RunnableVal3;
27
- import net.kyori.adventure.text.minimessage.Template;
27
+ import net.kyori.adventure.text.Component;
28
+ import net.kyori.adventure.text.minimessage.tag.Tag;
29
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
28
30
 
29
31
  import java.util.List;
30
32
  import java.util.concurrent.CompletableFuture;
@@ -49,7 +51,7 @@ public class Near extends Command {
49
51
  final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
50
52
  player.sendMessage(
51
53
  TranslatableCaption.of("near.plot_near"),
52
- Template.of("list", StringMan.join(getPlayersInPlotVisible(plot, player), ", "))
54
+ TagResolver.resolver("list", Tag.inserting(Component.text(StringMan.join(plot.getPlayersInPlot(), ", "))))
53
55
  );
54
56
  return CompletableFuture.completedFuture(true);
55
57
  }
Core/src/main/java/com/plotsquared/core/command/Owner.java CHANGED
@@ -34,7 +34,9 @@ import com.plotsquared.core.util.EventDispatcher;
34
34
  import com.plotsquared.core.util.PlayerManager;
35
35
  import com.plotsquared.core.util.TabCompletions;
36
36
  import com.plotsquared.core.util.task.TaskManager;
37
- import net.kyori.adventure.text.minimessage.Template;
37
+ import net.kyori.adventure.text.Component;
38
+ import net.kyori.adventure.text.minimessage.tag.Tag;
39
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
38
40
  import org.checkerframework.checker.nullness.qual.NonNull;
39
41
  import org.checkerframework.checker.nullness.qual.Nullable;
40
42
 
@@ -65,7 +67,7 @@ public class Owner extends SetCommand {
65
67
  if (value == null || value.isEmpty()) {
66
68
  player.sendMessage(
67
69
  TranslatableCaption.of("commandconfig.command_syntax"),
68
- Template.of("value", "/plot setowner <owner>")
70
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot setowner <owner>")))
69
71
  );
70
72
  return false;
71
73
  }
@@ -77,7 +79,7 @@ public class Owner extends SetCommand {
77
79
  && !value.equalsIgnoreCase("-")) {
78
80
  player.sendMessage(
79
81
  TranslatableCaption.of("errors.invalid_player"),
80
- Template.of("value", value)
82
+ TagResolver.resolver("value", Tag.inserting(Component.text(value)))
81
83
  );
82
84
  return;
83
85
  }
@@ -91,7 +93,7 @@ public class Owner extends SetCommand {
91
93
  if (event.getEventResult() == Result.DENY) {
92
94
  player.sendMessage(
93
95
  TranslatableCaption.of("events.event_denied"),
94
- Template.of("value", "Owner change")
96
+ TagResolver.resolver("value", Tag.inserting(Component.text("Owner change")))
95
97
  );
96
98
  return;
97
99
  }
@@ -114,7 +116,7 @@ public class Owner extends SetCommand {
114
116
  if (unlinkEvent.getEventResult() == Result.DENY) {
115
117
  player.sendMessage(
116
118
  TranslatableCaption.of("events.event_denied"),
117
- Template.of("value", "Unlink on owner change")
119
+ TagResolver.resolver("value", Tag.inserting(Component.text("Unlink on owner change")))
118
120
  );
119
121
  return;
120
122
  }
@@ -134,7 +136,10 @@ public class Owner extends SetCommand {
134
136
  if (plot.isOwner(uuid)) {
135
137
  player.sendMessage(
136
138
  TranslatableCaption.of("member.already_owner"),
137
- Template.of("player", PlayerManager.resolveName(uuid, false).getComponent(player))
139
+ TagResolver.resolver(
140
+ "player",
141
+ Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
142
+ )
138
143
  );
139
144
  return;
140
145
  }
@@ -142,7 +147,10 @@ public class Owner extends SetCommand {
142
147
  if (other == null) {
143
148
  player.sendMessage(
144
149
  TranslatableCaption.of("errors.invalid_player_offline"),
145
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
150
+ TagResolver.resolver(
151
+ "player",
152
+ Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
153
+ )
146
154
  );
147
155
  return;
148
156
  }
@@ -178,7 +186,10 @@ public class Owner extends SetCommand {
178
186
  if (other != null) {
179
187
  other.sendMessage(
180
188
  TranslatableCaption.of("owner.now_owner"),
181
- Template.of("plot", plot.getArea() + ";" + plot.getId())
189
+ TagResolver.resolver(
190
+ "plot",
191
+ Tag.inserting(Component.text(plot.getArea() + ";" + plot.getId()))
192
+ )
182
193
  );
183
194
  }
184
195
  } else {
Core/src/main/java/com/plotsquared/core/command/PluginCmd.java CHANGED
@@ -23,7 +23,9 @@ import com.plotsquared.core.configuration.caption.StaticCaption;
23
23
  import com.plotsquared.core.player.PlotPlayer;
24
24
  import com.plotsquared.core.util.PremiumVerification;
25
25
  import com.plotsquared.core.util.task.TaskManager;
26
- import net.kyori.adventure.text.minimessage.Template;
26
+ import net.kyori.adventure.text.Component;
27
+ import net.kyori.adventure.text.minimessage.tag.Tag;
28
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
27
29
 
28
30
  @CommandDeclaration(command = "plugin",
29
31
  permission = "plots.use",
@@ -39,7 +41,7 @@ public class PluginCmd extends SubCommand {
39
41
  StaticCaption.of("<gray>>> </gray><gold><bold>" + PlotSquared
40
42
  .platform()
41
43
  .pluginName() + " <reset><gray>(<gold>Version</gold><gray>: </gray><gold><version></gold><gray>)</gray>"),
42
- Template.of("version", String.valueOf(PlotSquared.get().getVersion()))
44
+ TagResolver.resolver("version", Tag.inserting(Component.text(String.valueOf(PlotSquared.get().getVersion()))))
43
45
  );
44
46
  player.sendMessage(StaticCaption.of(
45
47
  "<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
@@ -49,7 +51,7 @@ public class PluginCmd extends SubCommand {
49
51
  "<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
50
52
  player.sendMessage(
51
53
  StaticCaption.of("<gray>>> </gray><gold><bold>Premium<reset><gray>: <gold><value></gold>"),
52
- Template.of("value", String.valueOf(PremiumVerification.isPremium()))
54
+ TagResolver.resolver("value", Tag.inserting(Component.text(PremiumVerification.isPremium())))
53
55
  );
54
56
  });
55
57
  return true;
Core/src/main/java/com/plotsquared/core/command/Purge.java CHANGED
@@ -33,7 +33,9 @@ import com.plotsquared.core.util.StringMan;
33
33
  import com.plotsquared.core.util.query.PlotQuery;
34
34
  import com.plotsquared.core.util.task.TaskManager;
35
35
  import com.plotsquared.core.uuid.UUIDMapping;
36
- import net.kyori.adventure.text.minimessage.Template;
36
+ import net.kyori.adventure.text.Component;
37
+ import net.kyori.adventure.text.minimessage.tag.Tag;
38
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
37
39
  import org.apache.logging.log4j.LogManager;
38
40
  import org.apache.logging.log4j.Logger;
39
41
  import org.checkerframework.checker.nullness.qual.NonNull;
@@ -88,72 +90,56 @@ public class Purge extends SubCommand {
88
90
  return false;
89
91
  }
90
92
  switch (split[0].toLowerCase()) {
91
- case "world":
92
- case "w":
93
- world = split[1];
94
- break;
95
- case "area":
96
- case "a":
93
+ case "world", "w" -> world = split[1];
94
+ case "area", "a" -> {
97
95
  area = this.plotAreaManager.getPlotAreaByString(split[1]);
98
96
  if (area == null) {
99
97
  player.sendMessage(
100
98
  TranslatableCaption.of("errors.not_valid_plot_world"),
101
- Template.of("value", split[1])
99
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
102
100
  );
103
101
  return false;
104
102
  }
105
- break;
106
- case "plotid":
107
- case "id":
103
+ }
104
+ case "plotid", "id" -> {
108
105
  try {
109
106
  id = PlotId.fromString(split[1]);
110
107
  } catch (IllegalArgumentException ignored) {
111
108
  player.sendMessage(
112
109
  TranslatableCaption.of("invalid.not_valid_plot_id"),
113
- Template.of("value", split[1])
110
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
114
111
  );
115
112
  return false;
116
113
  }
117
- break;
118
- case "owner":
119
- case "o":
114
+ }
115
+ case "owner", "o" -> {
120
116
  UUIDMapping ownerMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
121
117
  if (ownerMapping == null) {
122
118
  player.sendMessage(
123
119
  TranslatableCaption.of("errors.invalid_player"),
124
- Template.of("value", split[1])
120
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
125
121
  );
126
122
  return false;
127
123
  }
128
- owner = ownerMapping.getUuid();
129
- break;
130
- case "shared":
131
- case "s":
124
+ owner = ownerMapping.uuid();
125
+ }
126
+ case "shared", "s" -> {
132
127
  UUIDMapping addedMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
133
128
  if (addedMapping == null) {
134
129
  player.sendMessage(
135
130
  TranslatableCaption.of("errors.invalid_player"),
136
- Template.of("value", split[1])
131
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
137
132
  );
138
133
  return false;
139
134
  }
140
- added = addedMapping.getUuid();
141
- break;
142
- case "clear":
143
- case "c":
144
- case "delete":
145
- case "d":
146
- case "del":
147
- clear = Boolean.parseBoolean(split[1]);
148
- break;
149
- case "unknown":
150
- case "?":
151
- case "u":
152
- unknown = Boolean.parseBoolean(split[1]);
153
- break;
154
- default:
135
+ added = addedMapping.uuid();
136
+ }
137
+ case "clear", "c", "delete", "d", "del" -> clear = Boolean.parseBoolean(split[1]);
138
+ case "unknown", "?", "u" -> unknown = Boolean.parseBoolean(split[1]);
139
+ default -> {
155
140
  sendUsage(player);
156
141
  return false;
142
+ }
157
143
  }
158
144
  }
159
145
  final HashSet<Plot> toDelete = new HashSet<>();
@@ -234,9 +220,9 @@ public class Purge extends SubCommand {
234
220
  try {
235
221
  ids.add(plot.temp);
236
222
  if (finalClear) {
237
- plot.getPlotModificationManager().clear(false, true, player, () -> {
238
- LOGGER.info("Plot {} cleared by purge", plot.getId());
239
- });
223
+ plot.getPlotModificationManager().clear(false, true, player,
224
+ () -> LOGGER.info("Plot {} cleared by purge", plot.getId())
225
+ );
240
226
  } else {
241
227
  plot.getPlotModificationManager().removeSign();
242
228
  }
@@ -258,7 +244,10 @@ public class Purge extends SubCommand {
258
244
  DBFunc.purgeIds(ids);
259
245
  player.sendMessage(
260
246
  TranslatableCaption.of("purge.purge_success"),
261
- Template.of("amount", ids.size() + "/" + toDelete.size())
247
+ TagResolver.resolver(
248
+ "amount",
249
+ Tag.inserting(Component.text(ids.size() + "/" + toDelete.size()))
250
+ )
262
251
  );
263
252
  });
264
253
  }
Core/src/main/java/com/plotsquared/core/command/Rate.java CHANGED
@@ -37,7 +37,9 @@ import com.plotsquared.core.util.MathMan;
37
37
  import com.plotsquared.core.util.TabCompletions;
38
38
  import com.plotsquared.core.util.query.PlotQuery;
39
39
  import com.plotsquared.core.util.task.TaskManager;
40
- import net.kyori.adventure.text.minimessage.Template;
40
+ import net.kyori.adventure.text.Component;
41
+ import net.kyori.adventure.text.minimessage.tag.Tag;
42
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
41
43
  import org.checkerframework.checker.nullness.qual.NonNull;
42
44
 
43
45
  import java.util.Collection;
@@ -146,7 +148,7 @@ public class Rate extends SubCommand {
146
148
  if (plot.getRatings().containsKey(player.getUUID())) {
147
149
  player.sendMessage(
148
150
  TranslatableCaption.of("ratings.rating_already_exists"),
149
- Template.of("plot", plot.getId().toString())
151
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
150
152
  );
151
153
  return;
152
154
  }
@@ -166,7 +168,7 @@ public class Rate extends SubCommand {
166
168
  plot.addRating(this.getPlayer().getUUID(), event.getRating());
167
169
  getPlayer().sendMessage(
168
170
  TranslatableCaption.of("ratings.rating_applied"),
169
- Template.of("plot", plot.getId().toString())
171
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
170
172
  );
171
173
  }
172
174
  return false;
@@ -239,7 +241,7 @@ public class Rate extends SubCommand {
239
241
  if (plot.getRatings().containsKey(uuid)) {
240
242
  player.sendMessage(
241
243
  TranslatableCaption.of("ratings.rating_already_exists"),
242
- Template.of("plot", plot.getId().toString())
244
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
243
245
  );
244
246
  return;
245
247
  }
@@ -249,7 +251,7 @@ public class Rate extends SubCommand {
249
251
  plot.addRating(uuid, event.getRating());
250
252
  player.sendMessage(
251
253
  TranslatableCaption.of("ratings.rating_applied"),
252
- Template.of("plot", plot.getId().toString())
254
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
253
255
  );
254
256
  }
255
257
  };
Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java CHANGED
@@ -26,7 +26,9 @@ import com.plotsquared.core.player.PlotPlayer;
26
26
  import com.plotsquared.core.plot.PlotArea;
27
27
  import com.plotsquared.core.plot.PlotManager;
28
28
  import com.plotsquared.core.plot.world.PlotAreaManager;
29
- import net.kyori.adventure.text.minimessage.Template;
29
+ import net.kyori.adventure.text.Component;
30
+ import net.kyori.adventure.text.minimessage.tag.Tag;
31
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
30
32
  import org.checkerframework.checker.nullness.qual.NonNull;
31
33
 
32
34
  @CommandDeclaration(command = "regenallroads",
@@ -58,18 +60,18 @@ public class RegenAllRoads extends SubCommand {
58
60
  } catch (NumberFormatException ignored) {
59
61
  player.sendMessage(
60
62
  TranslatableCaption.of("invalid.not_valid_number"),
61
- Template.of("value", "(0, 256)")
63
+ TagResolver.resolver("value", Tag.inserting(Component.text("(0, 256)")))
62
64
  );
63
65
  player.sendMessage(
64
66
  TranslatableCaption.of("commandconfig.command_syntax"),
65
- Template.of("value", "/plot regenallroads <world> [height]")
67
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads <world> [height]")))
66
68
  );
67
69
  return false;
68
70
  }
69
71
  } else if (args.length != 1) {
70
72
  player.sendMessage(
71
73
  TranslatableCaption.of("commandconfig.command_syntax"),
72
- Template.of("value", "/plot regenallroads <world> [height]")
74
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads <world> [height]")))
73
75
  );
74
76
  return false;
75
77
  }
@@ -77,7 +79,7 @@ public class RegenAllRoads extends SubCommand {
77
79
  if (area == null) {
78
80
  player.sendMessage(
79
81
  TranslatableCaption.of("errors.not_valid_plot_world"),
80
- Template.of("value", args[0])
82
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
81
83
  );
82
84
  return false;
83
85
  }
@@ -88,7 +90,7 @@ public class RegenAllRoads extends SubCommand {
88
90
  }
89
91
  player.sendMessage(
90
92
  TranslatableCaption.of("debugroadregen.schematic"),
91
- Template.of("command", "/plot createroadschematic")
93
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot createroadschematic")))
92
94
  );
93
95
  player.sendMessage(TranslatableCaption.of("debugroadregen.regenallroads_started"));
94
96
  boolean result = this.hybridUtils.scheduleRoadUpdate(area, height);
Core/src/main/java/com/plotsquared/core/command/Remove.java CHANGED
@@ -28,7 +28,9 @@ import com.plotsquared.core.plot.Plot;
28
28
  import com.plotsquared.core.util.EventDispatcher;
29
29
  import com.plotsquared.core.util.PlayerManager;
30
30
  import com.plotsquared.core.util.TabCompletions;
31
- import net.kyori.adventure.text.minimessage.Template;
31
+ import net.kyori.adventure.text.Component;
32
+ import net.kyori.adventure.text.minimessage.tag.Tag;
33
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
32
34
  import org.checkerframework.checker.nullness.qual.NonNull;
33
35
 
34
36
  import java.util.Collection;
@@ -77,7 +79,7 @@ public class Remove extends SubCommand {
77
79
  } else if (throwable != null) {
78
80
  player.sendMessage(
79
81
  TranslatableCaption.of("errors.invalid_player"),
80
- Template.of("value", args[0])
82
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
81
83
  );
82
84
  return;
83
85
  } else if (!uuids.isEmpty()) {
@@ -113,13 +115,13 @@ public class Remove extends SubCommand {
113
115
  }
114
116
  if (count == 0) {
115
117
  player.sendMessage(
116
- TranslatableCaption.of("member.player_not_removed"),
117
- Template.of("player", args[0])
118
+ TranslatableCaption.of("errors.invalid_player"),
119
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
118
120
  );
119
121
  } else {
120
122
  player.sendMessage(
121
123
  TranslatableCaption.of("member.removed_players"),
122
- Template.of("amount", count + "")
124
+ TagResolver.resolver("amount", Tag.inserting(Component.text(count)))
123
125
  );
124
126
  }
125
127
  });
Core/src/main/java/com/plotsquared/core/command/Save.java DELETED
@@ -1,130 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.core.command;
20
-
21
- import com.google.inject.Inject;
22
- import com.plotsquared.core.configuration.caption.TranslatableCaption;
23
- import com.plotsquared.core.location.Location;
24
- import com.plotsquared.core.permissions.Permission;
25
- import com.plotsquared.core.player.MetaDataAccess;
26
- import com.plotsquared.core.player.PlayerMetaDataKeys;
27
- import com.plotsquared.core.player.PlotPlayer;
28
- import com.plotsquared.core.plot.Plot;
29
- import com.plotsquared.core.plot.PlotId;
30
- import com.plotsquared.core.plot.world.PlotAreaManager;
31
- import com.plotsquared.core.util.SchematicHandler;
32
- import com.plotsquared.core.util.task.RunnableVal;
33
- import com.plotsquared.core.util.task.TaskManager;
34
- import net.kyori.adventure.text.minimessage.Template;
35
- import org.checkerframework.checker.nullness.qual.NonNull;
36
-
37
- import java.net.URL;
38
- import java.util.List;
39
- import java.util.UUID;
40
-
41
- /**
42
- * @deprecated In favor of "/plot download" (Arkitektonika) and scheduled
43
- * for removal within the next major release.
44
- */
45
- @Deprecated(forRemoval = true, since = "6.0.9")
46
- @CommandDeclaration(command = "save",
47
- category = CommandCategory.SCHEMATIC,
48
- requiredType = RequiredType.NONE,
49
- permission = "plots.save")
50
- public class Save extends SubCommand {
51
-
52
- private final PlotAreaManager plotAreaManager;
53
- private final SchematicHandler schematicHandler;
54
-
55
- @Inject
56
- public Save(
57
- final @NonNull PlotAreaManager plotAreaManager,
58
- final @NonNull SchematicHandler schematicHandler
59
- ) {
60
- this.plotAreaManager = plotAreaManager;
61
- this.schematicHandler = schematicHandler;
62
- }
63
-
64
- @Override
65
- public boolean onCommand(final PlotPlayer<?> player, final String[] args) {
66
- final String world = player.getLocation().getWorldName();
67
- if (!this.plotAreaManager.hasPlotArea(world)) {
68
- player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
69
- return false;
70
- }
71
- final Plot plot = player.getCurrentPlot();
72
- if (plot == null) {
73
- player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
74
- return false;
75
- }
76
- if (!plot.hasOwner()) {
77
- player.sendMessage(TranslatableCaption.of("info.plot_unowned"));
78
- return false;
79
- }
80
- if (plot.getVolume() > Integer.MAX_VALUE) {
81
- player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
82
- return false;
83
- }
84
- if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_SAVE)) {
85
- player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
86
- return false;
87
- }
88
- if (plot.getRunning() > 0) {
89
- player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
90
- return false;
91
- }
92
- plot.addRunning();
93
- this.schematicHandler.getCompoundTag(plot)
94
- .whenComplete((compoundTag, throwable) -> {
95
- TaskManager.runTaskAsync(() -> {
96
- String time = (System.currentTimeMillis() / 1000) + "";
97
- Location[] corners = plot.getCorners();
98
- corners[0] = corners[0].withY(plot.getArea().getMinBuildHeight());
99
- corners[1] = corners[1].withY(plot.getArea().getMaxBuildHeight());
100
- int size = (corners[1].getX() - corners[0].getX()) + 1;
101
- PlotId id = plot.getId();
102
- String world1 = plot.getArea().toString().replaceAll(";", "-")
103
- .replaceAll("[^A-Za-z0-9]", "");
104
- final String file = time + '_' + world1 + '_' + id.getX() + '_' + id.getY() + '_' + size;
105
- UUID uuid = player.getUUID();
106
- schematicHandler.upload(compoundTag, uuid, file, new RunnableVal<>() {
107
- @Override
108
- public void run(URL url) {
109
- plot.removeRunning();
110
- if (url == null) {
111
- player.sendMessage(TranslatableCaption.of("backups.backup_save_failed"));
112
- return;
113
- }
114
- player.sendMessage(TranslatableCaption.of("web.save_success"));
115
- player.sendMessage(
116
- TranslatableCaption.of("errors.deprecated_commands"),
117
- Template.of("replacement", "/plot download")
118
- );
119
- try (final MetaDataAccess<List<String>> schematicAccess =
120
- player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_SCHEMATICS)) {
121
- schematicAccess.get().ifPresent(schematics -> schematics.add(file + ".schem"));
122
- }
123
- }
124
- });
125
- });
126
- });
127
- return true;
128
- }
129
-
130
- }
Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java CHANGED
@@ -35,7 +35,9 @@ import com.plotsquared.core.util.StringMan;
35
35
  import com.plotsquared.core.util.TabCompletions;
36
36
  import com.plotsquared.core.util.task.RunnableVal;
37
37
  import com.plotsquared.core.util.task.TaskManager;
38
- import net.kyori.adventure.text.minimessage.Template;
38
+ import net.kyori.adventure.text.Component;
39
+ import net.kyori.adventure.text.minimessage.tag.Tag;
40
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
39
41
  import org.checkerframework.checker.nullness.qual.NonNull;
40
42
 
41
43
  import java.net.URL;
@@ -72,7 +74,7 @@ public class SchematicCmd extends SubCommand {
72
74
  if (args.length < 1) {
73
75
  player.sendMessage(
74
76
  TranslatableCaption.of("commandconfig.command_syntax"),
75
- Template.of("value", "Possible values: save, paste, exportall, list")
77
+ TagResolver.resolver("value", Tag.inserting(Component.text("Possible values: save, paste, exportall, list")))
76
78
  );
77
79
  return true;
78
80
  }
@@ -82,14 +84,20 @@ public class SchematicCmd extends SubCommand {
82
84
  if (!player.hasPermission(Permission.PERMISSION_SCHEMATIC_PASTE)) {
83
85
  player.sendMessage(
84
86
  TranslatableCaption.of("permission.no_permission"),
85
- Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_PASTE))
87
+ TagResolver.resolver(
88
+ "node",
89
+ Tag.inserting(Permission.PERMISSION_SCHEMATIC_PASTE)
90
+ )
86
91
  );
87
92
  return false;
88
93
  }
89
94
  if (args.length < 2) {
90
95
  player.sendMessage(
91
96
  TranslatableCaption.of("commandconfig.command_syntax"),
92
- Template.of("value", "Possible values: save, paste, exportall, list")
97
+ TagResolver.resolver(
98
+ "value",
99
+ Tag.inserting(Component.text("Possible values: save, paste, exportall, list"))
100
+ )
93
101
  );
94
102
  break;
95
103
  }
@@ -129,7 +137,10 @@ public class SchematicCmd extends SubCommand {
129
137
  e.printStackTrace();
130
138
  player.sendMessage(
131
139
  TranslatableCaption.of("schematics.schematic_invalid"),
132
- Template.of("reason", "non-existent url: " + location)
140
+ TagResolver.resolver(
141
+ "reason",
142
+ Tag.inserting(Component.text("non-existent url: " + location))
143
+ )
133
144
  );
134
145
  SchematicCmd.this.running = false;
135
146
  return;
@@ -145,7 +156,10 @@ public class SchematicCmd extends SubCommand {
145
156
  SchematicCmd.this.running = false;
146
157
  player.sendMessage(
147
158
  TranslatableCaption.of("schematics.schematic_invalid"),
148
- Template.of("reason", "non-existent or not in gzip format")
159
+ TagResolver.resolver(
160
+ "reason",
161
+ Tag.inserting(Component.text("non-existent or not in gzip format"))
162
+ )
149
163
  );
150
164
  return;
151
165
  }
@@ -180,7 +194,10 @@ public class SchematicCmd extends SubCommand {
180
194
  player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_world_args"));
181
195
  player.sendMessage(
182
196
  TranslatableCaption.of("commandconfig.command_syntax"),
183
- Template.of("value", "Use /plot schematic exportall <area>")
197
+ TagResolver.resolver(
198
+ "value",
199
+ Tag.inserting(Component.text("Use /plot schematic exportall <area>"))
200
+ )
184
201
  );
185
202
  return false;
186
203
  }
@@ -188,7 +205,7 @@ public class SchematicCmd extends SubCommand {
188
205
  if (area == null) {
189
206
  player.sendMessage(
190
207
  TranslatableCaption.of("errors.not_valid_plot_world"),
191
- Template.of("value", args[1])
208
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
192
209
  );
193
210
  return false;
194
211
  }
@@ -197,7 +214,7 @@ public class SchematicCmd extends SubCommand {
197
214
  player.sendMessage(TranslatableCaption.of("schematic.schematic_exportall_world"));
198
215
  player.sendMessage(
199
216
  TranslatableCaption.of("commandconfig.command_syntax"),
200
- Template.of("value", "Use /plot sch exportall <area>")
217
+ TagResolver.resolver("value", Tag.inserting(Component.text("Use /plot sch exportall <area>")))
201
218
  );
202
219
  return false;
203
220
  }
@@ -211,7 +228,7 @@ public class SchematicCmd extends SubCommand {
211
228
  player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_started"));
212
229
  player.sendMessage(
213
230
  TranslatableCaption.of("schematics.plot_to_schem"),
214
- Template.of("amount", String.valueOf(plots.size()))
231
+ TagResolver.resolver("amount", Tag.inserting(Component.text(plots.size())))
215
232
  );
216
233
  }
217
234
  }
@@ -219,7 +236,10 @@ public class SchematicCmd extends SubCommand {
219
236
  if (!player.hasPermission(Permission.PERMISSION_SCHEMATIC_SAVE)) {
220
237
  player.sendMessage(
221
238
  TranslatableCaption.of("permission.no_permission"),
222
- Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_SAVE))
239
+ TagResolver.resolver(
240
+ "node",
241
+ Tag.inserting(Permission.PERMISSION_SCHEMATIC_SAVE)
242
+ )
223
243
  );
224
244
  return false;
225
245
  }
@@ -261,19 +281,22 @@ public class SchematicCmd extends SubCommand {
261
281
  if (!player.hasPermission(Permission.PERMISSION_SCHEMATIC_LIST)) {
262
282
  player.sendMessage(
263
283
  TranslatableCaption.of("permission.no_permission"),
264
- Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_LIST))
284
+ TagResolver.resolver(
285
+ "node",
286
+ Tag.inserting(Permission.PERMISSION_SCHEMATIC_LIST)
287
+ )
265
288
  );
266
289
  return false;
267
290
  }
268
291
  final String string = StringMan.join(this.schematicHandler.getSchematicNames(), "$2, $1");
269
292
  player.sendMessage(
270
293
  TranslatableCaption.of("schematics.schematic_list"),
271
- Template.of("list", string)
294
+ TagResolver.resolver("list", Tag.inserting(Component.text(string)))
272
295
  );
273
296
  }
274
297
  default -> player.sendMessage(
275
298
  TranslatableCaption.of("commandconfig.command_syntax"),
276
- Template.of("value", "Possible values: save, paste, exportall, list")
299
+ TagResolver.resolver("value", Tag.inserting(Component.text("Possible values: save, paste, exportall, list")))
277
300
  );
278
301
  }
279
302
  return true;
Core/src/main/java/com/plotsquared/core/command/Set.java CHANGED
@@ -39,7 +39,9 @@ import com.sk89q.worldedit.function.pattern.Pattern;
39
39
  import com.sk89q.worldedit.world.block.BlockCategory;
40
40
  import com.sk89q.worldedit.world.block.BlockType;
41
41
  import com.sk89q.worldedit.world.block.BlockTypes;
42
- import net.kyori.adventure.text.minimessage.Template;
42
+ import net.kyori.adventure.text.Component;
43
+ import net.kyori.adventure.text.minimessage.tag.Tag;
44
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
43
45
  import org.checkerframework.checker.nullness.qual.NonNull;
44
46
 
45
47
  import java.util.ArrayList;
@@ -122,7 +124,7 @@ public class Set extends SubCommand {
122
124
  }
123
125
  player.sendMessage(
124
126
  TranslatableCaption.of("invalid.component_illegal_block"),
125
- Template.of("value", forbiddenType)
127
+ TagResolver.resolver("value", Tag.inserting(Component.text(forbiddenType)))
126
128
  );
127
129
  return true;
128
130
  }
@@ -134,7 +136,10 @@ public class Set extends SubCommand {
134
136
  if (!player.hasPermission(Permission.PERMISSION_SET_COMPONENT.format(component))) {
135
137
  player.sendMessage(
136
138
  TranslatableCaption.of("permission.no_permission"),
137
- Template.of("node", Permission.PERMISSION_SET_COMPONENT.format(component))
139
+ TagResolver.resolver(
140
+ "node",
141
+ Tag.inserting(Component.text(Permission.PERMISSION_SET_COMPONENT.format(component)))
142
+ )
138
143
  );
139
144
  return false;
140
145
  }
@@ -157,7 +162,7 @@ public class Set extends SubCommand {
157
162
  plot.removeRunning();
158
163
  player.sendMessage(
159
164
  TranslatableCaption.of("working.component_complete"),
160
- Template.of("plot", plot.getId().toString())
165
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
161
166
  );
162
167
  });
163
168
  if (Settings.QUEUE.NOTIFY_PROGRESS) {
Core/src/main/java/com/plotsquared/core/command/SetCommand.java CHANGED
@@ -24,7 +24,9 @@ import com.plotsquared.core.permissions.Permission;
24
24
  import com.plotsquared.core.player.PlotPlayer;
25
25
  import com.plotsquared.core.plot.Plot;
26
26
  import com.plotsquared.core.util.StringMan;
27
- import net.kyori.adventure.text.minimessage.Template;
27
+ import net.kyori.adventure.text.Component;
28
+ import net.kyori.adventure.text.minimessage.tag.Tag;
29
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
28
30
 
29
31
  public abstract class SetCommand extends SubCommand {
30
32
 
@@ -40,7 +42,10 @@ public abstract class SetCommand extends SubCommand {
40
42
  if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) {
41
43
  player.sendMessage(
42
44
  TranslatableCaption.of("permission.no_permission"),
43
- Template.of("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))
45
+ TagResolver.resolver(
46
+ "node",
47
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_COMMAND.format(getFullId())))
48
+ )
44
49
  );
45
50
  player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
46
51
  return false;
@@ -50,7 +55,10 @@ public abstract class SetCommand extends SubCommand {
50
55
  if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) {
51
56
  player.sendMessage(
52
57
  TranslatableCaption.of("permission.no_permission"),
53
- Template.of("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))
58
+ TagResolver.resolver(
59
+ "node",
60
+ Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_COMMAND.format(getFullId())))
61
+ )
54
62
  );
55
63
  player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
56
64
  return false;
Core/src/main/java/com/plotsquared/core/command/SetHome.java CHANGED
@@ -23,7 +23,9 @@ import com.plotsquared.core.location.BlockLoc;
23
23
  import com.plotsquared.core.location.Location;
24
24
  import com.plotsquared.core.player.PlotPlayer;
25
25
  import com.plotsquared.core.plot.Plot;
26
- import net.kyori.adventure.text.minimessage.Template;
26
+ import net.kyori.adventure.text.Component;
27
+ import net.kyori.adventure.text.minimessage.tag.Tag;
28
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
27
29
 
28
30
  @CommandDeclaration(command = "sethome",
29
31
  permission = "plots.set.home",
@@ -64,7 +66,7 @@ public class SetHome extends SetCommand {
64
66
  default -> {
65
67
  player.sendMessage(
66
68
  TranslatableCaption.of("commandconfig.command_syntax"),
67
- Template.of("value", "Use /plot set home [none]")
69
+ TagResolver.resolver("value", Tag.inserting(Component.text("Use /plot set home [none]")))
68
70
  );
69
71
  return false;
70
72
  }
Core/src/main/java/com/plotsquared/core/command/Setup.java CHANGED
@@ -29,7 +29,9 @@ import com.plotsquared.core.player.PlotPlayer;
29
29
  import com.plotsquared.core.setup.SetupProcess;
30
30
  import com.plotsquared.core.setup.SetupStep;
31
31
  import com.plotsquared.core.util.SetupUtils;
32
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.minimessage.tag.Tag;
34
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
33
35
  import org.checkerframework.checker.nullness.qual.NonNull;
34
36
 
35
37
  import java.util.ArrayList;
@@ -78,7 +80,10 @@ public class Setup extends SubCommand {
78
80
  player.sendMessage(TranslatableCaption.of("setup.setup_not_started"));
79
81
  player.sendMessage(
80
82
  TranslatableCaption.of("commandconfig.command_syntax"),
81
- Template.of("value", "Use /plot setup to start a setup process.")
83
+ TagResolver.resolver(
84
+ "value",
85
+ Tag.inserting(Component.text("Use /plot setup to start a setup process."))
86
+ )
82
87
  );
83
88
  return true;
84
89
  }
Core/src/main/java/com/plotsquared/core/command/Swap.java CHANGED
@@ -25,7 +25,9 @@ import com.plotsquared.core.player.PlotPlayer;
25
25
  import com.plotsquared.core.plot.Plot;
26
26
  import com.plotsquared.core.util.task.RunnableVal2;
27
27
  import com.plotsquared.core.util.task.RunnableVal3;
28
- import net.kyori.adventure.text.minimessage.Template;
28
+ import net.kyori.adventure.text.Component;
29
+ import net.kyori.adventure.text.minimessage.tag.Tag;
30
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
29
31
 
30
32
  import java.util.concurrent.CompletableFuture;
31
33
 
@@ -82,8 +84,10 @@ public class Swap extends SubCommand {
82
84
  if (result) {
83
85
  player.sendMessage(
84
86
  TranslatableCaption.of("swap.swap_success"),
85
- Template.of("origin", p1),
86
- Template.of("target", p2)
87
+ TagResolver.builder()
88
+ .tag("origin", Tag.inserting(Component.text(p1)))
89
+ .tag("target", Tag.inserting(Component.text(p2)))
90
+ .build()
87
91
  );
88
92
  return true;
89
93
  } else {
Core/src/main/java/com/plotsquared/core/command/Target.java CHANGED
@@ -24,7 +24,9 @@ import com.plotsquared.core.player.PlotPlayer;
24
24
  import com.plotsquared.core.plot.Plot;
25
25
  import com.plotsquared.core.util.StringMan;
26
26
  import com.plotsquared.core.util.query.PlotQuery;
27
- import net.kyori.adventure.text.minimessage.Template;
27
+ import net.kyori.adventure.text.Component;
28
+ import net.kyori.adventure.text.minimessage.tag.Tag;
29
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
28
30
 
29
31
  import java.util.Collection;
30
32
  import java.util.Locale;
@@ -52,7 +54,7 @@ public class Target extends SubCommand {
52
54
  if (args.length == 0) {
53
55
  player.sendMessage(
54
56
  TranslatableCaption.of("commandconfig.command_syntax"),
55
- Template.of("value", "/plot target <<X;Z> | nearest>")
57
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot target <<X;Z> | nearest>")))
56
58
  );
57
59
  return false;
58
60
  }
@@ -76,7 +78,7 @@ public class Target extends SubCommand {
76
78
  target.getCenter(player::setCompassTarget);
77
79
  player.sendMessage(
78
80
  TranslatableCaption.of("compass.compass_target"),
79
- Template.of("target", target.toString())
81
+ TagResolver.resolver("target", Tag.inserting(Component.text(target.toString())))
80
82
  );
81
83
  return true;
82
84
  }
Core/src/main/java/com/plotsquared/core/command/Template.java CHANGED
@@ -43,6 +43,9 @@ import com.plotsquared.core.util.SetupUtils;
43
43
  import com.plotsquared.core.util.TabCompletions;
44
44
  import com.plotsquared.core.util.WorldUtil;
45
45
  import com.plotsquared.core.util.task.TaskManager;
46
+ import net.kyori.adventure.text.Component;
47
+ import net.kyori.adventure.text.minimessage.tag.Tag;
48
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
46
49
  import org.checkerframework.checker.nullness.qual.NonNull;
47
50
 
48
51
  import java.io.File;
@@ -153,9 +156,9 @@ public class Template extends SubCommand {
153
156
  ZipOutputStream zos = new ZipOutputStream(fos)) {
154
157
 
155
158
  for (FileBytes file : files) {
156
- ZipEntry ze = new ZipEntry(file.path);
159
+ ZipEntry ze = new ZipEntry(file.path());
157
160
  zos.putNextEntry(ze);
158
- zos.write(file.data);
161
+ zos.write(file.data());
159
162
  }
160
163
  zos.closeEntry();
161
164
  }
@@ -168,13 +171,16 @@ public class Template extends SubCommand {
168
171
  if (args[0].equalsIgnoreCase("export")) {
169
172
  player.sendMessage(
170
173
  TranslatableCaption.of("commandconfig.command_syntax"),
171
- net.kyori.adventure.text.minimessage.Template.of("value", "/plot template export <world>")
174
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot template export <world>")))
172
175
  );
173
176
  return true;
174
177
  } else if (args[0].equalsIgnoreCase("import")) {
175
178
  player.sendMessage(
176
179
  TranslatableCaption.of("commandconfig.command_syntax"),
177
- net.kyori.adventure.text.minimessage.Template.of("value", "/plot template import <world> <template>")
180
+ TagResolver.resolver(
181
+ "value",
182
+ Tag.inserting(Component.text("/plot template import <world> <template>"))
183
+ )
178
184
  );
179
185
  return true;
180
186
  }
@@ -188,14 +194,17 @@ public class Template extends SubCommand {
188
194
  if (args.length != 3) {
189
195
  player.sendMessage(
190
196
  TranslatableCaption.of("commandconfig.command_syntax"),
191
- net.kyori.adventure.text.minimessage.Template.of("value", "/plot template import <world> <template>")
197
+ TagResolver.resolver(
198
+ "value",
199
+ Tag.inserting(Component.text("/plot template import <world> <template>"))
200
+ )
192
201
  );
193
202
  return false;
194
203
  }
195
204
  if (this.plotAreaManager.hasPlotArea(world)) {
196
205
  player.sendMessage(
197
206
  TranslatableCaption.of("setup.setup_world_taken"),
198
- net.kyori.adventure.text.minimessage.Template.of("value", world)
207
+ TagResolver.resolver("value", Tag.inserting(Component.text(world)))
199
208
  );
200
209
  return false;
201
210
  }
@@ -203,7 +212,7 @@ public class Template extends SubCommand {
203
212
  if (!result) {
204
213
  player.sendMessage(
205
214
  TranslatableCaption.of("template.invalid_template"),
206
- net.kyori.adventure.text.minimessage.Template.of("value", args[2])
215
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[2])))
207
216
  );
208
217
  return false;
209
218
  }
@@ -241,7 +250,7 @@ public class Template extends SubCommand {
241
250
  if (args.length != 2) {
242
251
  player.sendMessage(
243
252
  TranslatableCaption.of("commandconfig.command_syntax"),
244
- net.kyori.adventure.text.minimessage.Template.of("value", "/plot template export <world>")
253
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot template export <world>")))
245
254
  );
246
255
  return false;
247
256
  }
@@ -249,7 +258,7 @@ public class Template extends SubCommand {
249
258
  if (area == null) {
250
259
  player.sendMessage(
251
260
  TranslatableCaption.of("errors.not_valid_plot_world"),
252
- net.kyori.adventure.text.minimessage.Template.of("value", args[1])
261
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
253
262
  );
254
263
  return false;
255
264
  }
@@ -261,7 +270,7 @@ public class Template extends SubCommand {
261
270
  e.printStackTrace();
262
271
  player.sendMessage(
263
272
  TranslatableCaption.of("template.template_failed"),
264
- net.kyori.adventure.text.minimessage.Template.of("value", e.getMessage())
273
+ TagResolver.resolver("value", Tag.inserting(Component.text(e.getMessage())))
265
274
  );
266
275
  return;
267
276
  }
Core/src/main/java/com/plotsquared/core/command/Toggle.java CHANGED
@@ -22,7 +22,9 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
22
22
  import com.plotsquared.core.player.PlotPlayer;
23
23
  import com.plotsquared.core.util.task.RunnableVal2;
24
24
  import com.plotsquared.core.util.task.RunnableVal3;
25
- import net.kyori.adventure.text.minimessage.Template;
25
+ import net.kyori.adventure.text.Component;
26
+ import net.kyori.adventure.text.minimessage.tag.Tag;
27
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
26
28
 
27
29
  @CommandDeclaration(command = "toggle",
28
30
  aliases = {"attribute"},
@@ -47,12 +49,12 @@ public class Toggle extends Command {
47
49
  if (toggle(player, "chatspy")) {
48
50
  player.sendMessage(
49
51
  TranslatableCaption.of("toggle.toggle_disabled"),
50
- Template.of("setting", command.toString())
52
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
51
53
  );
52
54
  } else {
53
55
  player.sendMessage(
54
56
  TranslatableCaption.of("toggle.toggle_enabled"),
55
- Template.of("setting", command.toString())
57
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
56
58
  );
57
59
  }
58
60
  }
@@ -68,12 +70,12 @@ public class Toggle extends Command {
68
70
  if (toggle(player, "worldedit")) {
69
71
  player.sendMessage(
70
72
  TranslatableCaption.of("toggle.toggle_disabled"),
71
- Template.of("setting", command.toString())
73
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
72
74
  );
73
75
  } else {
74
76
  player.sendMessage(
75
77
  TranslatableCaption.of("toggle.toggle_enabled"),
76
- Template.of("setting", command.toString())
78
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
77
79
  );
78
80
  }
79
81
  }
@@ -88,12 +90,12 @@ public class Toggle extends Command {
88
90
  if (toggle(player, "chat")) {
89
91
  player.sendMessage(
90
92
  TranslatableCaption.of("toggle.toggle_disabled"),
91
- Template.of("setting", command.toString())
93
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
92
94
  );
93
95
  } else {
94
96
  player.sendMessage(
95
97
  TranslatableCaption.of("toggle.toggle_enabled"),
96
- Template.of("setting", command.toString())
98
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
97
99
  );
98
100
  }
99
101
  }
@@ -108,12 +110,12 @@ public class Toggle extends Command {
108
110
  if (toggle(player, "ignoreExpireTask")) {
109
111
  player.sendMessage(
110
112
  TranslatableCaption.of("toggle.toggle_enabled"),
111
- Template.of("setting", command.toString())
113
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
112
114
  );
113
115
  } else {
114
116
  player.sendMessage(
115
117
  TranslatableCaption.of("toggle.toggle_disabled"),
116
- Template.of("setting", command.toString())
118
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
117
119
  );
118
120
  }
119
121
  }
@@ -128,12 +130,12 @@ public class Toggle extends Command {
128
130
  if (toggle(player, "disabletitles")) {
129
131
  player.sendMessage(
130
132
  TranslatableCaption.of("toggle.toggle_enabled"),
131
- Template.of("setting", command.toString())
133
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
132
134
  );
133
135
  } else {
134
136
  player.sendMessage(
135
137
  TranslatableCaption.of("toggle.toggle_disabled"),
136
- Template.of("setting", command.toString())
138
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
137
139
  );
138
140
  }
139
141
  }
@@ -148,12 +150,12 @@ public class Toggle extends Command {
148
150
  if (toggle(player, "disabletime")) {
149
151
  player.sendMessage(
150
152
  TranslatableCaption.of("toggle.toggle_enabled"),
151
- Template.of("setting", command.toString())
153
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
152
154
  );
153
155
  } else {
154
156
  player.sendMessage(
155
157
  TranslatableCaption.of("toggle.toggle_disabled"),
156
- Template.of("setting", command.toString())
158
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
157
159
  );
158
160
  }
159
161
  }
@@ -168,12 +170,12 @@ public class Toggle extends Command {
168
170
  if (toggle(player, "debug")) {
169
171
  player.sendMessage(
170
172
  TranslatableCaption.of("toggle.toggle_disabled"),
171
- Template.of("setting", command.toString())
173
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
172
174
  );
173
175
  } else {
174
176
  player.sendMessage(
175
177
  TranslatableCaption.of("toggle.toggle_enabled"),
176
- Template.of("setting", command.toString())
178
+ TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
177
179
  );
178
180
  }
179
181
  player.refreshDebug();
Core/src/main/java/com/plotsquared/core/command/Trust.java CHANGED
@@ -20,7 +20,6 @@ package com.plotsquared.core.command;
20
20
 
21
21
  import com.google.inject.Inject;
22
22
  import com.plotsquared.core.configuration.Settings;
23
- import com.plotsquared.core.configuration.caption.Templates;
24
23
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
25
24
  import com.plotsquared.core.database.DBFunc;
26
25
  import com.plotsquared.core.permissions.Permission;
@@ -31,7 +30,9 @@ import com.plotsquared.core.util.PlayerManager;
31
30
  import com.plotsquared.core.util.TabCompletions;
32
31
  import com.plotsquared.core.util.task.RunnableVal2;
33
32
  import com.plotsquared.core.util.task.RunnableVal3;
34
- import net.kyori.adventure.text.minimessage.Template;
33
+ import net.kyori.adventure.text.Component;
34
+ import net.kyori.adventure.text.minimessage.tag.Tag;
35
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
35
36
  import org.checkerframework.checker.nullness.qual.NonNull;
36
37
 
37
38
  import java.util.Collection;
@@ -73,7 +74,7 @@ public class Trust extends Command {
73
74
  );
74
75
 
75
76
  checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"),
76
- Templates.of("value", getUsage())
77
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
77
78
  );
78
79
 
79
80
  final CompletableFuture<Boolean> future = new CompletableFuture<>();
@@ -84,14 +85,14 @@ public class Trust extends Command {
84
85
  } else {
85
86
  player.sendMessage(
86
87
  TranslatableCaption.of("errors.invalid_player"),
87
- Template.of("value", args[0])
88
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
88
89
  );
89
90
  }
90
91
  future.completeExceptionally(throwable);
91
92
  return;
92
93
  } else {
93
94
  checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
94
- Templates.of("value", args[0])
95
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
95
96
  );
96
97
 
97
98
  Iterator<UUID> iterator = uuids.iterator();
@@ -102,7 +103,10 @@ public class Trust extends Command {
102
103
  player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
103
104
  player.sendMessage(
104
105
  TranslatableCaption.of("errors.invalid_player"),
105
- Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
106
+ TagResolver.resolver(
107
+ "value",
108
+ Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
109
+ )
106
110
  );
107
111
  iterator.remove();
108
112
  continue;
@@ -110,7 +114,10 @@ public class Trust extends Command {
110
114
  if (currentPlot.isOwner(uuid)) {
111
115
  player.sendMessage(
112
116
  TranslatableCaption.of("member.already_added"),
113
- Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
117
+ TagResolver.resolver(
118
+ "value",
119
+ Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
120
+ )
114
121
  );
115
122
  iterator.remove();
116
123
  continue;
@@ -118,7 +125,10 @@ public class Trust extends Command {
118
125
  if (currentPlot.getTrusted().contains(uuid)) {
119
126
  player.sendMessage(
120
127
  TranslatableCaption.of("member.already_added"),
121
- Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
128
+ TagResolver.resolver(
129
+ "value",
130
+ Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
131
+ )
122
132
  );
123
133
  iterator.remove();
124
134
  continue;
@@ -131,7 +141,7 @@ public class Trust extends Command {
131
141
  if (localTrustSize >= maxTrustSize) {
132
142
  player.sendMessage(
133
143
  TranslatableCaption.of("members.plot_max_members_trusted"),
134
- Template.of("amount", String.valueOf(localTrustSize))
144
+ TagResolver.resolver("amount", Tag.inserting(Component.text(localTrustSize)))
135
145
  );
136
146
  return;
137
147
  }
Core/src/main/java/com/plotsquared/core/command/Unlink.java CHANGED
@@ -29,7 +29,9 @@ import com.plotsquared.core.plot.Plot;
29
29
  import com.plotsquared.core.util.EventDispatcher;
30
30
  import com.plotsquared.core.util.StringMan;
31
31
  import com.plotsquared.core.util.task.TaskManager;
32
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.minimessage.tag.Tag;
34
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
33
35
  import org.checkerframework.checker.nullness.qual.NonNull;
34
36
 
35
37
  @CommandDeclaration(command = "unlink",
@@ -85,7 +87,7 @@ public class Unlink extends SubCommand {
85
87
  if (event.getEventResult() == Result.DENY) {
86
88
  player.sendMessage(
87
89
  TranslatableCaption.of("events.event_denied"),
88
- Template.of("value", "Unlink")
90
+ TagResolver.resolver("value", Tag.inserting(Component.text("Unlink")))
89
91
  );
90
92
  return true;
91
93
  }
Core/src/main/java/com/plotsquared/core/command/Visit.java CHANGED
@@ -21,7 +21,6 @@ package com.plotsquared.core.command;
21
21
  import com.google.inject.Inject;
22
22
  import com.plotsquared.core.PlotSquared;
23
23
  import com.plotsquared.core.configuration.Settings;
24
- import com.plotsquared.core.configuration.caption.Templates;
25
24
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
26
25
  import com.plotsquared.core.events.TeleportCause;
27
26
  import com.plotsquared.core.permissions.Permission;
@@ -37,7 +36,9 @@ import com.plotsquared.core.util.query.PlotQuery;
37
36
  import com.plotsquared.core.util.query.SortingStrategy;
38
37
  import com.plotsquared.core.util.task.RunnableVal2;
39
38
  import com.plotsquared.core.util.task.RunnableVal3;
40
- import net.kyori.adventure.text.minimessage.Template;
39
+ import net.kyori.adventure.text.Component;
40
+ import net.kyori.adventure.text.minimessage.tag.Tag;
41
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
41
42
  import org.checkerframework.checker.nullness.qual.NonNull;
42
43
 
43
44
  import java.util.ArrayList;
@@ -99,8 +100,10 @@ public class Visit extends Command {
99
100
  } else if (plots.size() < page || page < 1) {
100
101
  player.sendMessage(
101
102
  TranslatableCaption.of("invalid.number_not_in_range"),
102
- Template.of("min", "1"),
103
- Template.of("max", String.valueOf(plots.size()))
103
+ TagResolver.builder()
104
+ .tag("min", Tag.inserting(Component.text(1)))
105
+ .tag("max", Tag.inserting(Component.text(plots.size())))
106
+ .build()
104
107
  );
105
108
  return;
106
109
  }
@@ -110,7 +113,7 @@ public class Visit extends Command {
110
113
  if (!player.hasPermission(Permission.PERMISSION_VISIT_UNOWNED)) {
111
114
  player.sendMessage(
112
115
  TranslatableCaption.of("permission.no_permission"),
113
- Templates.of("node", "plots.visit.unowned")
116
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.unowned")))
114
117
  );
115
118
  return;
116
119
  }
@@ -118,7 +121,7 @@ public class Visit extends Command {
118
121
  if (!player.hasPermission(Permission.PERMISSION_VISIT_OWNED) && !player.hasPermission(Permission.PERMISSION_HOME)) {
119
122
  player.sendMessage(
120
123
  TranslatableCaption.of("permission.no_permission"),
121
- Templates.of("node", "plots.visit.owned")
124
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.owned")))
122
125
  );
123
126
  return;
124
127
  }
@@ -126,7 +129,7 @@ public class Visit extends Command {
126
129
  if (!player.hasPermission(Permission.PERMISSION_SHARED)) {
127
130
  player.sendMessage(
128
131
  TranslatableCaption.of("permission.no_permission"),
129
- Templates.of("node", "plots.visit.shared")
132
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.shared")))
130
133
  );
131
134
  return;
132
135
  }
@@ -137,7 +140,7 @@ public class Visit extends Command {
137
140
  && !player.hasPermission(Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) {
138
141
  player.sendMessage(
139
142
  TranslatableCaption.of("permission.no_permission"),
140
- Templates.of("node", "plots.visit.other")
143
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.other")))
141
144
  );
142
145
  return;
143
146
  }
@@ -145,7 +148,10 @@ public class Visit extends Command {
145
148
  if (!player.hasPermission(Permission.PERMISSION_VISIT_DENIED)) {
146
149
  player.sendMessage(
147
150
  TranslatableCaption.of("permission.no_permission"),
148
- Template.of("node", String.valueOf(Permission.PERMISSION_VISIT_DENIED))
151
+ TagResolver.resolver(
152
+ "node",
153
+ Tag.inserting(Permission.PERMISSION_VISIT_DENIED)
154
+ )
149
155
  );
150
156
  return;
151
157
  }
@@ -187,11 +193,11 @@ public class Visit extends Command {
187
193
  if (!MathMan.isInteger(args[2])) {
188
194
  player.sendMessage(
189
195
  TranslatableCaption.of("invalid.not_valid_number"),
190
- Templates.of("value", "(1, ∞)")
196
+ TagResolver.resolver("value", Tag.inserting(Component.text("(1, ∞)")))
191
197
  );
192
198
  player.sendMessage(
193
199
  TranslatableCaption.of("commandconfig.command_syntax"),
194
- Templates.of("value", getUsage())
200
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
195
201
  );
196
202
  return CompletableFuture.completedFuture(false);
197
203
  }
@@ -204,11 +210,11 @@ public class Visit extends Command {
204
210
  if (sortByArea == null) {
205
211
  player.sendMessage(
206
212
  TranslatableCaption.of("invalid.not_valid_number"),
207
- Templates.of("value", "(1, ∞)")
213
+ TagResolver.resolver("value", Tag.inserting(Component.text("(1, ∞)")))
208
214
  );
209
215
  player.sendMessage(
210
216
  TranslatableCaption.of("commandconfig.command_syntax"),
211
- Templates.of("value", getUsage())
217
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
212
218
  );
213
219
  return CompletableFuture.completedFuture(false);
214
220
  }
@@ -221,7 +227,7 @@ public class Visit extends Command {
221
227
  } else if (throwable != null || uuids.size() != 1) {
222
228
  player.sendMessage(
223
229
  TranslatableCaption.of("commandconfig.command_syntax"),
224
- Templates.of("value", getUsage())
230
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
225
231
  );
226
232
  } else {
227
233
  final UUID uuid = uuids.toArray(new UUID[0])[0];
@@ -248,7 +254,7 @@ public class Visit extends Command {
248
254
  } catch (NumberFormatException ignored) {
249
255
  player.sendMessage(
250
256
  TranslatableCaption.of("invalid.not_a_number"),
251
- Template.of("value", args[1])
257
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
252
258
  );
253
259
  return CompletableFuture.completedFuture(false);
254
260
  }
@@ -283,7 +289,7 @@ public class Visit extends Command {
283
289
  } else {
284
290
  player.sendMessage(
285
291
  TranslatableCaption.of("errors.invalid_player"),
286
- Template.of("value", finalArgs[0])
292
+ TagResolver.resolver("value", Tag.inserting(Component.text(finalArgs[0])))
287
293
  );
288
294
  }
289
295
  } else {
@@ -311,7 +317,7 @@ public class Visit extends Command {
311
317
  // /p v is invalid
312
318
  player.sendMessage(
313
319
  TranslatableCaption.of("commandconfig.command_syntax"),
314
- Templates.of("value", getUsage())
320
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
315
321
  );
316
322
  return CompletableFuture.completedFuture(false);
317
323
  default:
Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java CHANGED
@@ -35,34 +35,22 @@ import java.util.Map;
35
35
  * the component GUI
36
36
  */
37
37
  @SerializableAs("preset")
38
- public class ComponentPreset implements ConfigurationSerializable {
39
-
40
- private final ClassicPlotManagerComponent component;
41
- private final String pattern;
42
- private final double cost;
43
- private final String permission;
44
- private final String displayName;
45
- private final List<String> description;
46
- private final ItemType icon;
47
-
48
- public ComponentPreset(
49
- ClassicPlotManagerComponent component, String pattern, double cost,
50
- String permission, String displayName, List<String> description, final ItemType icon
51
- ) {
52
- this.component = component;
53
- this.pattern = pattern;
54
- this.cost = cost;
55
- this.permission = permission;
56
- this.displayName = displayName;
57
- this.description = description;
58
- this.icon = icon;
59
- }
38
+ public record ComponentPreset(
39
+ ClassicPlotManagerComponent component,
40
+ String pattern,
41
+ double cost,
42
+ String permission,
43
+ String displayName,
44
+ List<String> description,
45
+ ItemType icon
46
+ ) implements ConfigurationSerializable {
60
47
 
61
48
  @SuppressWarnings("unchecked")
62
49
  public static ComponentPreset deserialize(final @NonNull Map<String, Object> map) {
63
50
  final ClassicPlotManagerComponent classicPlotManagerComponent = ClassicPlotManagerComponent
64
51
  .fromString(map.getOrDefault("component", "").toString()).orElseThrow(() ->
65
- new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get("component")));
52
+ new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get(
53
+ "component")));
66
54
  final String pattern = map.getOrDefault("pattern", "").toString();
67
55
  final double cost = Double.parseDouble(map.getOrDefault("cost", "0.0").toString());
68
56
  final String permission = map.getOrDefault("permission", "").toString();
@@ -74,34 +62,6 @@ public class ComponentPreset implements ConfigurationSerializable {
74
62
  );
75
63
  }
76
64
 
77
- public ClassicPlotManagerComponent getComponent() {
78
- return this.component;
79
- }
80
-
81
- public String getPattern() {
82
- return this.pattern;
83
- }
84
-
85
- public double getCost() {
86
- return this.cost;
87
- }
88
-
89
- public String getPermission() {
90
- return this.permission;
91
- }
92
-
93
- public String getDisplayName() {
94
- return this.displayName;
95
- }
96
-
97
- public List<String> getDescription() {
98
- return this.description;
99
- }
100
-
101
- public ItemType getIcon() {
102
- return this.icon;
103
- }
104
-
105
65
  @Override
106
66
  public Map<String, Object> serialize() {
107
67
  final Map<String, Object> map = new HashMap<>();
Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java CHANGED
@@ -37,8 +37,10 @@ import com.plotsquared.core.util.InventoryUtil;
37
37
  import com.plotsquared.core.util.PatternUtil;
38
38
  import com.sk89q.worldedit.function.pattern.Pattern;
39
39
  import com.sk89q.worldedit.world.item.ItemTypes;
40
+ import net.kyori.adventure.text.Component;
40
41
  import net.kyori.adventure.text.minimessage.MiniMessage;
41
- import net.kyori.adventure.text.minimessage.Template;
42
+ import net.kyori.adventure.text.minimessage.tag.Tag;
43
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
42
44
  import org.apache.logging.log4j.LogManager;
43
45
  import org.apache.logging.log4j.Logger;
44
46
  import org.checkerframework.checker.nullness.qual.NonNull;
@@ -163,8 +165,8 @@ public class ComponentPresetManager {
163
165
 
164
166
  final List<ComponentPreset> allowedPresets = new ArrayList<>(this.presets.size());
165
167
  for (final ComponentPreset componentPreset : this.presets) {
166
- if (!componentPreset.getPermission().isEmpty() && !player.hasPermission(
167
- componentPreset.getPermission()
168
+ if (!componentPreset.permission().isEmpty() && !player.hasPermission(
169
+ componentPreset.permission()
168
170
  )) {
169
171
  continue;
170
172
  }
@@ -176,7 +178,8 @@ public class ComponentPresetManager {
176
178
  }
177
179
  final int size = (int) Math.ceil((double) allowedPresets.size() / 9.0D);
178
180
  final PlotInventory plotInventory = new PlotInventory(this.inventoryUtil, player, size,
179
- TranslatableCaption.of("preset.title").getComponent(player)) {
181
+ TranslatableCaption.of("preset.title").getComponent(player)
182
+ ) {
180
183
  @Override
181
184
  public boolean onClick(final int index) {
182
185
  if (!getPlayer().getCurrentPlot().equals(plot)) {
@@ -197,27 +200,31 @@ public class ComponentPresetManager {
197
200
  return false;
198
201
  }
199
202
 
200
- final Pattern pattern = PatternUtil.parse(null, componentPreset.getPattern(), false);
203
+ final Pattern pattern = PatternUtil.parse(null, componentPreset.pattern(), false);
201
204
  if (pattern == null) {
202
205
  getPlayer().sendMessage(TranslatableCaption.of("preset.preset_invalid"));
203
206
  return false;
204
207
  }
205
208
 
206
- if (componentPreset.getCost() > 0.0D) {
209
+ if (componentPreset.cost() > 0.0D) {
207
210
  if (!econHandler.isEnabled(plot.getArea())) {
208
211
  getPlayer().sendMessage(
209
212
  TranslatableCaption.of("preset.economy_disabled"),
210
- Template.of("preset", componentPreset.getDisplayName()));
213
+ TagResolver.resolver("preset", Tag.inserting(Component.text(componentPreset.displayName())))
214
+ );
211
215
  return false;
212
216
  }
213
- if (econHandler.getMoney(getPlayer()) < componentPreset.getCost()) {
217
+ if (econHandler.getMoney(getPlayer()) < componentPreset.cost()) {
214
218
  getPlayer().sendMessage(TranslatableCaption.of("preset.preset_cannot_afford"));
215
219
  return false;
216
220
  } else {
217
- econHandler.withdrawMoney(getPlayer(), componentPreset.getCost());
221
+ econHandler.withdrawMoney(getPlayer(), componentPreset.cost());
218
222
  getPlayer().sendMessage(
219
223
  TranslatableCaption.of("economy.removed_balance"),
220
- Template.of("money", econHandler.format(componentPreset.getCost()))
224
+ TagResolver.resolver(
225
+ "money",
226
+ Tag.inserting(Component.text(econHandler.format(componentPreset.cost())))
227
+ )
221
228
  );
222
229
  }
223
230
  }
@@ -228,7 +235,7 @@ public class ComponentPresetManager {
228
235
  queue.setCompleteTask(plot::removeRunning);
229
236
  for (Plot current : plot.getConnectedPlots()) {
230
237
  current.getPlotModificationManager().setComponent(
231
- componentPreset.getComponent().name(),
238
+ componentPreset.component().name(),
232
239
  pattern,
233
240
  player,
234
241
  queue
@@ -245,30 +252,32 @@ public class ComponentPresetManager {
245
252
  for (int i = 0; i < allowedPresets.size(); i++) {
246
253
  final ComponentPreset preset = allowedPresets.get(i);
247
254
  final List<String> lore = new ArrayList<>();
248
- if (preset.getCost() > 0) {
255
+ if (preset.cost() > 0) {
249
256
  if (!this.econHandler.isEnabled(plot.getArea())) {
250
- lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
257
+ lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
251
258
  TranslatableCaption.of("preset.preset_lore_economy_disabled").getComponent(player))));
252
259
  } else {
253
- lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
260
+ lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
254
261
  TranslatableCaption.of("preset.preset_lore_cost").getComponent(player),
255
- Template.of("cost", String.format("%.2f", preset.getCost()))
262
+ TagResolver.resolver("cost", Tag.inserting(Component.text(String.format("%.2f", preset.cost()))))
256
263
  )));
257
264
  }
258
265
  }
259
- lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
266
+ lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
260
267
  TranslatableCaption.of("preset.preset_lore_component").getComponent(player),
261
- Template.of("component", preset.getComponent().name().toLowerCase()),
262
- Template.of("prefix", TranslatableCaption.of("core.prefix").getComponent(player))
268
+ TagResolver.builder()
269
+ .tag("component", Tag.inserting(Component.text(preset.component().name().toLowerCase())))
270
+ .tag("prefix", Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(player)))
271
+ .build()
263
272
  )));
264
273
  lore.removeIf(String::isEmpty);
265
- lore.addAll(preset.getDescription());
274
+ lore.addAll(preset.description());
266
275
  plotInventory.setItem(
267
276
  i,
268
277
  new PlotItemStack(
269
- preset.getIcon().getId().replace("minecraft:", ""),
278
+ preset.icon().getId().replace("minecraft:", ""),
270
279
  1,
271
- preset.getDisplayName(),
280
+ preset.displayName(),
272
281
  lore.toArray(new String[0])
273
282
  )
274
283
  );
Core/src/main/java/com/plotsquared/core/configuration/Config.java CHANGED
@@ -42,34 +42,6 @@ public class Config {
42
42
 
43
43
  private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Config.class.getSimpleName());
44
44
 
45
- /**
46
- * Get the value for a node<br>
47
- * Probably throws some error if you try to get a non existent key
48
- *
49
- * @param key configuration key
50
- * @param root configuration class
51
- * @param <T> value type
52
- * @return value
53
- * @deprecated Unused internally. Scheduled for removal in next major release.
54
- */
55
- @Deprecated(forRemoval = true, since = "6.11.1")
56
- @SuppressWarnings("unchecked")
57
- public static <T> T get(String key, Class<?> root) {
58
- String[] split = key.split("\\.");
59
- Object instance = getInstance(split, root);
60
- if (instance != null) {
61
- Field field = getField(split, instance);
62
- if (field != null) {
63
- try {
64
- return (T) field.get(instance);
65
- } catch (IllegalAccessException e) {
66
- e.printStackTrace();
67
- }
68
- }
69
- }
70
- return null;
71
- }
72
-
73
45
  /**
74
46
  * Set the value of a specific node<br>
75
47
  * Probably throws some error if you supply non existing keys or invalid values
@@ -261,7 +233,6 @@ public class Config {
261
233
  *
262
234
  * @param split the node (split by period)
263
235
  * @param instance the instance
264
- * @return
265
236
  */
266
237
  private static Field getField(String[] split, Object instance) {
267
238
  try {
@@ -447,14 +418,6 @@ public class Config {
447
418
  return INSTANCES.values();
448
419
  }
449
420
 
450
- /**
451
- * @deprecated Unused internally. Scheduled for removal in next major release.
452
- */
453
- @Deprecated(forRemoval = true, since = "6.11.1")
454
- public Collection<String> getSections() {
455
- return INSTANCES.keySet();
456
- }
457
-
458
421
  private Map<String, T> getRaw() {
459
422
  return INSTANCES;
460
423
  }
Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java CHANGED
@@ -18,6 +18,8 @@
18
18
  */
19
19
  package com.plotsquared.core.configuration.caption;
20
20
 
21
+ import net.kyori.adventure.text.Component;
22
+ import net.kyori.adventure.text.ComponentLike;
21
23
  import org.checkerframework.checker.nullness.qual.NonNull;
22
24
 
23
25
  /**
@@ -33,4 +35,13 @@ public interface Caption {
33
35
  */
34
36
  @NonNull String getComponent(@NonNull LocaleHolder localeHolder);
35
37
 
38
+ /**
39
+ * Get the Adventure {@link ComponentLike} for this caption
40
+ *
41
+ * @param localeHolder Locale holder
42
+ * @return {@link ComponentLike}
43
+ * @since 7.0.0
44
+ */
45
+ @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
46
+
36
47
  }
Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java CHANGED
@@ -18,27 +18,53 @@
18
18
  */
19
19
  package com.plotsquared.core.configuration.caption;
20
20
 
21
- import net.kyori.adventure.text.minimessage.Template;
21
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
22
22
 
23
+ /**
24
+ * A holder for a caption.
25
+ * Useful when constructing messages in multiple steps with {@link TagResolver}s.
26
+ */
23
27
  public class CaptionHolder {
24
28
 
25
29
  private Caption caption = StaticCaption.of("");
26
- private Template[] templates = new Template[0];
30
+ private TagResolver[] tagResolvers = new TagResolver[0];
27
31
 
32
+ /**
33
+ * Set the {@link Caption} to send.
34
+ *
35
+ * @param caption The new caption.
36
+ */
28
37
  public void set(Caption caption) {
29
38
  this.caption = caption;
30
39
  }
31
40
 
41
+ /**
42
+ * Get the {@link Caption} to send.
43
+ *
44
+ * @return The caption to send.
45
+ */
32
46
  public Caption get() {
33
47
  return this.caption;
34
48
  }
35
49
 
36
- public Template[] getTemplates() {
37
- return this.templates;
50
+ /**
51
+ * Get the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
52
+ *
53
+ * @return The tag resolvers to use.
54
+ * @since 7.0.0
55
+ */
56
+ public TagResolver[] getTagResolvers() {
57
+ return this.tagResolvers;
38
58
  }
39
59
 
40
- public void setTemplates(Template... templates) {
41
- this.templates = templates;
60
+ /**
61
+ * Set the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
62
+ *
63
+ * @param tagResolvers The tag resolvers to use.
64
+ * @since 7.0.0
65
+ */
66
+ public void setTagResolvers(TagResolver... tagResolvers) {
67
+ this.tagResolvers = tagResolvers;
42
68
  }
43
69
 
44
70
  }
Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java CHANGED
@@ -28,16 +28,20 @@ import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
28
28
  import net.kyori.adventure.text.Component;
29
29
  import net.kyori.adventure.text.event.ClickEvent;
30
30
  import net.kyori.adventure.text.minimessage.MiniMessage;
31
+ import net.kyori.adventure.text.minimessage.ParsingException;
31
32
  import org.checkerframework.checker.nullness.qual.NonNull;
32
33
  import org.checkerframework.checker.nullness.qual.Nullable;
33
34
 
34
35
  import java.util.Set;
36
+ import java.util.regex.Pattern;
35
37
 
36
38
  import static com.plotsquared.core.configuration.caption.ComponentTransform.nested;
37
39
  import static com.plotsquared.core.configuration.caption.ComponentTransform.stripClicks;
38
40
 
39
41
  public class CaptionUtility {
40
42
 
43
+ private static final Pattern LEGACY_FORMATTING = Pattern.compile("§[a-gklmnor0-9]");
44
+
41
45
  // flags which values are parsed by minimessage
42
46
  private static final Set<Class<? extends PlotFlag<?, ?>>> MINI_MESSAGE_FLAGS = Set.of(
43
47
  GreetingFlag.class,
@@ -100,9 +104,16 @@ public class CaptionUtility {
100
104
  */
101
105
  public static String stripClickEvents(final @NonNull String miniMessageString) {
102
106
  // parse, transform and serialize again
103
- Component component = MiniMessage.get().parse(miniMessageString);
107
+ Component component;
108
+ try {
109
+ component = MiniMessage.miniMessage().deserialize(miniMessageString);
110
+ } catch (ParsingException e) {
111
+ // if the String cannot be parsed, we try stripping legacy colors
112
+ String legacyStripped = LEGACY_FORMATTING.matcher(miniMessageString).replaceAll("");
113
+ component = MiniMessage.miniMessage().deserialize(legacyStripped);
114
+ }
104
115
  component = CLICK_STRIP_TRANSFORM.transform(component);
105
- return MiniMessage.get().serialize(component);
116
+ return MiniMessage.miniMessage().serialize(component);
106
117
  }
107
118
 
108
119
  /**
Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java CHANGED
@@ -19,6 +19,8 @@
19
19
  package com.plotsquared.core.configuration.caption;
20
20
 
21
21
  import com.google.common.base.Preconditions;
22
+ import net.kyori.adventure.text.Component;
23
+ import net.kyori.adventure.text.minimessage.MiniMessage;
22
24
  import org.checkerframework.checker.nullness.qual.NonNull;
23
25
 
24
26
  public final class StaticCaption implements Caption {
@@ -44,4 +46,9 @@ public final class StaticCaption implements Caption {
44
46
  return this.value; // can't be translated
45
47
  }
46
48
 
49
+ @Override
50
+ public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
51
+ return MiniMessage.miniMessage().deserialize(this.value);
52
+ }
53
+
47
54
  }
Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java DELETED
@@ -1,103 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.core.configuration.caption;
20
-
21
- import com.plotsquared.core.plot.PlotArea;
22
- import com.plotsquared.core.util.PlayerManager;
23
- import net.kyori.adventure.text.minimessage.MiniMessage;
24
- import net.kyori.adventure.text.minimessage.Template;
25
- import org.checkerframework.checker.nullness.qual.NonNull;
26
-
27
- import java.util.UUID;
28
-
29
- /**
30
- * Utility class that generates {@link net.kyori.adventure.text.minimessage.Template templates}
31
- */
32
- public final class Templates {
33
-
34
- private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
35
-
36
- private Templates() {
37
- throw new UnsupportedOperationException(
38
- "This is a utility class and cannot be instantiated");
39
- }
40
-
41
- /**
42
- * Create a {@link net.kyori.adventure.text.minimessage.Template} from a PlotSquared {@link Caption}
43
- *
44
- * @param localeHolder Locale holder
45
- * @param key Template key
46
- * @param caption Caption object
47
- * @param replacements Replacements
48
- * @return Generated template
49
- */
50
- public static @NonNull Template of(
51
- final @NonNull LocaleHolder localeHolder,
52
- final @NonNull String key, final @NonNull Caption caption,
53
- final @NonNull Template... replacements
54
- ) {
55
- return Template.of(key, MINI_MESSAGE.parse(caption.getComponent(localeHolder), replacements));
56
- }
57
-
58
- /**
59
- * Create a {@link Template} from a username (using UUID mappings)
60
- *
61
- * @param key Template key
62
- * @param uuid Player UUID
63
- * @return Generated template
64
- */
65
- public static @NonNull Template of(final @NonNull String key, final @NonNull UUID uuid) {
66
- final String username = PlayerManager.resolveName(uuid).getComponent(LocaleHolder.console());
67
- return Template.of(key, username);
68
- }
69
-
70
- /**
71
- * Create a {@link Template} from a string
72
- *
73
- * @param key Template key
74
- * @param value Template value
75
- * @return Generated template
76
- */
77
- public static @NonNull Template of(final @NonNull String key, final @NonNull String value) {
78
- return Template.of(key, value);
79
- }
80
-
81
- /**
82
- * Create a {@link Template} from a plot area
83
- *
84
- * @param key Template Key
85
- * @param area Plot area
86
- * @return Generated template
87
- */
88
- public static @NonNull Template of(final @NonNull String key, final @NonNull PlotArea area) {
89
- return Template.of(key, area.toString());
90
- }
91
-
92
- /**
93
- * Create a {@link Template} from a number
94
- *
95
- * @param key Template key
96
- * @param number Number
97
- * @return Generated template
98
- */
99
- public static @NonNull Template of(final @NonNull String key, final @NonNull Number number) {
100
- return Template.of(key, number.toString());
101
- }
102
-
103
- }
Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java CHANGED
@@ -20,6 +20,10 @@ package com.plotsquared.core.configuration.caption;
20
20
 
21
21
  import com.google.common.base.Objects;
22
22
  import com.plotsquared.core.PlotSquared;
23
+ import net.kyori.adventure.text.Component;
24
+ import net.kyori.adventure.text.minimessage.MiniMessage;
25
+ import net.kyori.adventure.text.minimessage.tag.Tag;
26
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
23
27
  import org.checkerframework.checker.nullness.qual.NonNull;
24
28
 
25
29
  import java.util.Locale;
@@ -89,6 +93,17 @@ public final class TranslatableCaption implements NamespacedCaption {
89
93
  return PlotSquared.get().getCaptionMap(this.namespace).getMessage(this, localeHolder);
90
94
  }
91
95
 
96
+ @Override
97
+ public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
98
+ if (getKey().equals("core.prefix")) {
99
+ return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
100
+ }
101
+ return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), TagResolver.resolver(
102
+ "prefix",
103
+ Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(localeHolder))
104
+ ));
105
+ }
106
+
92
107
  @Override
93
108
  public @NonNull String getKey() {
94
109
  return this.key;
Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java CHANGED
@@ -225,7 +225,7 @@ public final class CaptionLoader {
225
225
  */
226
226
  public @NonNull CaptionMap loadOrCreateSingle(final @NonNull Path file) throws IOException {
227
227
  final Locale locale = this.localeExtractor.apply(file);
228
- if (!Files.exists(file) ) {
228
+ if (!Files.exists(file)) {
229
229
  Map<String, String> map = new LinkedHashMap<>();
230
230
  patch(map, locale);
231
231
  save(file, map);
Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java CHANGED
@@ -56,7 +56,8 @@ final class ClassLoaderCaptionProvider implements DefaultCaptionProvider {
56
56
  LOGGER.info("No resource for locale '{}' found in the plugin file." +
57
57
  "Please ensure you have placed the latest version of the file messages_{}.json in the 'lang' folder." +
58
58
  "You may be able to find completed translations at https://intellectualsites.crowdin.com/plotsquared",
59
- locale, locale);
59
+ locale, locale
60
+ );
60
61
  return null;
61
62
  }
62
63
  try (final BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java CHANGED
@@ -19,6 +19,7 @@
19
19
  package com.plotsquared.core.configuration.file;
20
20
 
21
21
  import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
22
+ import org.yaml.snakeyaml.LoaderOptions;
22
23
  import org.yaml.snakeyaml.constructor.SafeConstructor;
23
24
  import org.yaml.snakeyaml.error.YAMLException;
24
25
  import org.yaml.snakeyaml.nodes.Node;
@@ -30,6 +31,7 @@ import java.util.Map;
30
31
  public class YamlConstructor extends SafeConstructor {
31
32
 
32
33
  YamlConstructor() {
34
+ super(new LoaderOptions());
33
35
  yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
34
36
  }
35
37
 
Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java CHANGED
@@ -21,6 +21,7 @@ package com.plotsquared.core.configuration.file;
21
21
  import com.plotsquared.core.configuration.ConfigurationSection;
22
22
  import com.plotsquared.core.configuration.serialization.ConfigurationSerializable;
23
23
  import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
24
+ import org.yaml.snakeyaml.DumperOptions;
24
25
  import org.yaml.snakeyaml.nodes.Node;
25
26
  import org.yaml.snakeyaml.representer.Representer;
26
27
 
@@ -30,6 +31,7 @@ import java.util.Map;
30
31
  class YamlRepresenter extends Representer {
31
32
 
32
33
  YamlRepresenter() {
34
+ super(new DumperOptions());
33
35
  this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
34
36
  this.multiRepresenters
35
37
  .put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
Core/src/main/java/com/plotsquared/core/database/SQLManager.java CHANGED
@@ -2400,13 +2400,13 @@ public class SQLManager implements AbstractDB {
2400
2400
  if (plot != null) {
2401
2401
  statement.setString(1, plot.getArea().toString());
2402
2402
  statement.setInt(2, plot.getId().hashCode());
2403
- statement.setString(3, comment.comment);
2404
- statement.setString(4, comment.inbox);
2405
- statement.setString(5, comment.senderName);
2403
+ statement.setString(3, comment.comment());
2404
+ statement.setString(4, comment.inbox());
2405
+ statement.setString(5, comment.senderName());
2406
2406
  } else {
2407
- statement.setString(1, comment.comment);
2408
- statement.setString(2, comment.inbox);
2409
- statement.setString(3, comment.senderName);
2407
+ statement.setString(1, comment.comment());
2408
+ statement.setString(2, comment.inbox());
2409
+ statement.setString(3, comment.senderName());
2410
2410
  }
2411
2411
  }
2412
2412
 
@@ -2518,10 +2518,10 @@ public class SQLManager implements AbstractDB {
2518
2518
  public void set(PreparedStatement statement) throws SQLException {
2519
2519
  statement.setString(1, plot.getArea().toString());
2520
2520
  statement.setInt(2, plot.getId().hashCode());
2521
- statement.setString(3, comment.comment);
2522
- statement.setString(4, comment.inbox);
2523
- statement.setInt(5, (int) (comment.timestamp / 1000));
2524
- statement.setString(6, comment.senderName);
2521
+ statement.setString(3, comment.comment());
2522
+ statement.setString(4, comment.inbox());
2523
+ statement.setInt(5, (int) (comment.timestamp() / 1000));
2524
+ statement.setString(6, comment.senderName());
2525
2525
  }
2526
2526
 
2527
2527
  @Override
@@ -3414,15 +3414,10 @@ public class SQLManager implements AbstractDB {
3414
3414
  }
3415
3415
  }
3416
3416
 
3417
- private static class LegacySettings {
3418
-
3419
- public final int id;
3420
- public final PlotSettings settings;
3421
-
3422
- public LegacySettings(int id, PlotSettings settings) {
3423
- this.id = id;
3424
- this.settings = settings;
3425
- }
3417
+ private record LegacySettings(
3418
+ int id,
3419
+ PlotSettings settings
3420
+ ) {
3426
3421
 
3427
3422
  }
3428
3423
 
Core/src/main/java/com/plotsquared/core/events/EntityEvent.java CHANGED
@@ -53,7 +53,8 @@ public abstract class EntityEvent {
53
53
  * @return the event class name
54
54
  * @since 6.11.0
55
55
  */
56
- @NonNull public String getEventName() {
56
+ @NonNull
57
+ public String getEventName() {
57
58
  if (this.name == null) {
58
59
  this.name = this.getClass().getSimpleName();
59
60
  }
Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java CHANGED
@@ -105,38 +105,6 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
105
105
  return this.plotArea;
106
106
  }
107
107
 
108
- /**
109
- * @deprecated for removal. Use {@link PlayerAutoPlotEvent#getSizeX()}
110
- */
111
- @Deprecated(forRemoval = true, since = "6.1.0")
112
- public int getSize_x() {
113
- return getSizeX();
114
- }
115
-
116
- /**
117
- * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)}
118
- */
119
- @Deprecated(forRemoval = true, since = "6.1.0")
120
- public void setSize_x(int sizeX) {
121
- setSizeX(sizeX);
122
- }
123
-
124
- /**
125
- * @deprecated for removal. Use {@link PlayerAutoPlotEvent#getSizeZ()}
126
- */
127
- @Deprecated(forRemoval = true, since = "6.1.0")
128
- public int getSize_z() {
129
- return getSizeZ();
130
- }
131
-
132
- /**
133
- * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)}
134
- */
135
- @Deprecated(forRemoval = true, since = "6.1.0")
136
- public void setSize_z(int sizeZ) {
137
- setSizeZ(sizeZ);
138
- }
139
-
140
108
  /**
141
109
  * Get the x size of the auto-area
142
110
  *
Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java CHANGED
@@ -31,15 +31,6 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
31
31
  private final TeleportCause cause;
32
32
  private Result eventResult;
33
33
 
34
- /**
35
- * @deprecated use {@link PlayerTeleportToPlotEvent#PlayerTeleportToPlotEvent(PlotPlayer, Location, Plot, TeleportCause)}.
36
- * You should not be creating events in the first place.
37
- */
38
- @Deprecated(forRemoval = true, since = "6.1.0")
39
- public PlayerTeleportToPlotEvent(PlotPlayer<?> player, Location from, Plot plot) {
40
- this(player, from, plot, TeleportCause.UNKNOWN);
41
- }
42
-
43
34
  /**
44
35
  * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
45
36
  *
Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java CHANGED
@@ -27,7 +27,7 @@ import com.plotsquared.core.plot.PlotManager;
27
27
  import com.plotsquared.core.queue.AreaBoundDelegateQueueCoordinator;
28
28
  import com.plotsquared.core.queue.LocationOffsetDelegateQueueCoordinator;
29
29
  import com.plotsquared.core.queue.QueueCoordinator;
30
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
30
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
31
31
  import com.plotsquared.core.util.RegionUtil;
32
32
  import com.sk89q.worldedit.regions.CuboidRegion;
33
33
  import com.sk89q.worldedit.world.block.BlockState;
@@ -161,13 +161,13 @@ public class AugmentedUtils {
161
161
 
162
162
  // This queue should not be enqueued as it is simply used to restrict block setting, and then delegate to the
163
163
  // actual queue
164
- ScopedQueueCoordinator scoped =
165
- new ScopedQueueCoordinator(
164
+ ZeroedDelegateScopedQueueCoordinator scoped =
165
+ new ZeroedDelegateScopedQueueCoordinator(
166
166
  secondaryMask,
167
167
  Location.at(world, blockX, area.getMinGenHeight(), blockZ),
168
168
  Location.at(world, blockX + 15, area.getMaxGenHeight(), blockZ + 15)
169
169
  );
170
- generator.generateChunk(scoped, area);
170
+ generator.generateChunk(scoped, area, true);
171
171
  generator.populateChunk(scoped, area);
172
172
  }
173
173
  if (enqueue) {
@@ -176,19 +176,4 @@ public class AugmentedUtils {
176
176
  return generationResult;
177
177
  }
178
178
 
179
- /**
180
- * @deprecated Use {@link AugmentedUtils#generateChunk(String, int, int, QueueCoordinator)} as chunkObject is not required
181
- * in the above method
182
- */
183
- @Deprecated(forRemoval = true, since = "6.8.0")
184
- public static boolean generate(
185
- @Nullable Object chunkObject,
186
- final @NonNull String world,
187
- final int chunkX,
188
- final int chunkZ,
189
- QueueCoordinator queue
190
- ) {
191
- return generateChunk(world, chunkX, chunkZ, queue);
192
- }
193
-
194
179
  }
Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java CHANGED
@@ -379,10 +379,11 @@ public class ClassicPlotManager extends SquarePlotManager {
379
379
  }
380
380
  }
381
381
 
382
+ int yStart = classicPlotWorld.getMinBuildHeight() + (classicPlotWorld.PLOT_BEDROCK ? 1 : 0);
382
383
  if (!plot.isMerged(Direction.NORTH)) {
383
384
  int z = bot.getZ();
384
385
  for (int x = bot.getX(); x < top.getX(); x++) {
385
- for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
386
+ for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
386
387
  queue.setBlock(x, y, z, blocks);
387
388
  }
388
389
  }
@@ -390,7 +391,7 @@ public class ClassicPlotManager extends SquarePlotManager {
390
391
  if (!plot.isMerged(Direction.WEST)) {
391
392
  int x = bot.getX();
392
393
  for (int z = bot.getZ(); z < top.getZ(); z++) {
393
- for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
394
+ for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
394
395
  queue.setBlock(x, y, z, blocks);
395
396
  }
396
397
  }
@@ -398,7 +399,7 @@ public class ClassicPlotManager extends SquarePlotManager {
398
399
  if (!plot.isMerged(Direction.SOUTH)) {
399
400
  int z = top.getZ();
400
401
  for (int x = bot.getX(); x < top.getX() + (plot.isMerged(Direction.EAST) ? 0 : 1); x++) {
401
- for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
402
+ for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
402
403
  queue.setBlock(x, y, z, blocks);
403
404
  }
404
405
  }
@@ -406,7 +407,7 @@ public class ClassicPlotManager extends SquarePlotManager {
406
407
  if (!plot.isMerged(Direction.EAST)) {
407
408
  int x = top.getX();
408
409
  for (int z = bot.getZ(); z < top.getZ() + (plot.isMerged(Direction.SOUTH) ? 0 : 1); z++) {
409
- for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
410
+ for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
410
411
  queue.setBlock(x, y, z, blocks);
411
412
  }
412
413
  }
Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java CHANGED
@@ -38,6 +38,7 @@ import javax.annotation.Nullable;
38
38
 
39
39
  @SuppressWarnings("WeakerAccess")
40
40
  public abstract class ClassicPlotWorld extends SquarePlotWorld {
41
+
41
42
  private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ClassicPlotWorld.class.getSimpleName());
42
43
 
43
44
  public int ROAD_HEIGHT = 62;
@@ -64,6 +65,21 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
64
65
  super(worldName, id, generator, min, max, worldConfiguration, blockQueue);
65
66
  }
66
67
 
68
+ private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) {
69
+ final BlockBucket bucket = new BlockBucket(input);
70
+ Pattern pattern = null;
71
+ try {
72
+ pattern = bucket.toPattern();
73
+ } catch (Exception ignore) {
74
+ }
75
+ if (pattern == null) {
76
+ LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input);
77
+ LOGGER.error("Falling back to {}", def);
78
+ return def;
79
+ }
80
+ return bucket;
81
+ }
82
+
67
83
  /**
68
84
  * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP.
69
85
  *
@@ -144,19 +160,4 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
144
160
  return Math.min(WALL_HEIGHT, plotRoadMin);
145
161
  }
146
162
 
147
- private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) {
148
- final BlockBucket bucket = new BlockBucket(input);
149
- Pattern pattern = null;
150
- try {
151
- pattern = bucket.toPattern();
152
- } catch (Exception ignore) {
153
- }
154
- if (pattern == null) {
155
- LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input);
156
- LOGGER.error("Falling back to {}", def);
157
- return def;
158
- }
159
- return bucket;
160
- }
161
-
162
163
  }
Core/src/main/java/com/plotsquared/core/generator/HybridGen.java CHANGED
@@ -26,7 +26,7 @@ import com.plotsquared.core.inject.factory.HybridPlotWorldFactory;
26
26
  import com.plotsquared.core.location.Location;
27
27
  import com.plotsquared.core.plot.PlotArea;
28
28
  import com.plotsquared.core.plot.PlotId;
29
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
29
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
30
30
  import com.plotsquared.core.util.MathMan;
31
31
  import com.sk89q.worldedit.entity.BaseEntity;
32
32
  import com.sk89q.worldedit.entity.Entity;
@@ -42,6 +42,8 @@ import com.sk89q.worldedit.world.block.BlockTypes;
42
42
  import org.checkerframework.checker.nullness.qual.NonNull;
43
43
  import org.checkerframework.checker.nullness.qual.Nullable;
44
44
 
45
+ import java.util.EnumSet;
46
+
45
47
  public class HybridGen extends IndependentPlotGenerator {
46
48
 
47
49
  private static final CuboidRegion CHUNK = new CuboidRegion(BlockVector3.ZERO, BlockVector3.at(15, 396, 15));
@@ -59,16 +61,16 @@ public class HybridGen extends IndependentPlotGenerator {
59
61
 
60
62
  private void placeSchem(
61
63
  HybridPlotWorld world,
62
- ScopedQueueCoordinator result,
64
+ ZeroedDelegateScopedQueueCoordinator result,
63
65
  short relativeX,
64
66
  short relativeZ,
65
67
  int x,
66
68
  int z,
67
- boolean isRoad,
68
- boolean isPopulating
69
+ EnumSet<SchematicFeature> features
69
70
  ) {
70
71
  int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
71
- if ((isRoad && Settings.Schematics.PASTE_ROAD_ON_TOP) || (!isRoad && Settings.Schematics.PASTE_ON_TOP)) {
72
+ if ((features.contains(SchematicFeature.ROAD) && Settings.Schematics.PASTE_ROAD_ON_TOP)
73
+ || (!features.contains(SchematicFeature.ROAD) && Settings.Schematics.PASTE_ON_TOP)) {
72
74
  minY = world.SCHEM_Y;
73
75
  } else {
74
76
  minY = world.getMinBuildHeight();
@@ -77,12 +79,15 @@ public class HybridGen extends IndependentPlotGenerator {
77
79
  if (blocks != null) {
78
80
  for (int y = 0; y < blocks.length; y++) {
79
81
  if (blocks[y] != null) {
80
- if (!isPopulating || blocks[y].hasNbtData()) {
82
+ if (!features.contains(SchematicFeature.POPULATING) || blocks[y].hasNbtData()) {
81
83
  result.setBlock(x, minY + y, z, blocks[y]);
82
84
  }
83
85
  }
84
86
  }
85
87
  }
88
+ if (!features.contains(SchematicFeature.BIOMES)) {
89
+ return;
90
+ }
86
91
  BiomeType biome = world.G_SCH_B.get(MathMan.pair(relativeX, relativeZ));
87
92
  if (biome != null) {
88
93
  result.setBiome(x, z, biome);
@@ -90,13 +95,15 @@ public class HybridGen extends IndependentPlotGenerator {
90
95
  }
91
96
 
92
97
  @Override
93
- public void generateChunk(@NonNull ScopedQueueCoordinator result, @NonNull PlotArea settings) {
98
+ public void generateChunk(@NonNull ZeroedDelegateScopedQueueCoordinator result, @NonNull PlotArea settings, boolean biomes) {
94
99
  Preconditions.checkNotNull(result, "result cannot be null");
95
100
  Preconditions.checkNotNull(settings, "settings cannot be null");
96
101
 
97
102
  HybridPlotWorld hybridPlotWorld = (HybridPlotWorld) settings;
98
103
  // Biome
99
- result.fillBiome(hybridPlotWorld.getPlotBiome());
104
+ if (biomes) {
105
+ result.fillBiome(hybridPlotWorld.getPlotBiome());
106
+ }
100
107
  // Bedrock
101
108
  if (hybridPlotWorld.PLOT_BEDROCK) {
102
109
  for (short x = 0; x < 16; x++) {
@@ -105,26 +112,25 @@ public class HybridGen extends IndependentPlotGenerator {
105
112
  }
106
113
  }
107
114
  }
115
+ EnumSet<SchematicFeature> roadFeatures = EnumSet.of(SchematicFeature.ROAD);
116
+ EnumSet<SchematicFeature> plotFeatures = EnumSet.noneOf(SchematicFeature.class);
117
+ if (biomes) {
118
+ roadFeatures.add(SchematicFeature.BIOMES);
119
+ plotFeatures.add(SchematicFeature.BIOMES);
120
+ }
121
+
108
122
  // Coords
109
123
  Location min = result.getMin();
110
124
  int bx = min.getX() - hybridPlotWorld.ROAD_OFFSET_X;
111
125
  int bz = min.getZ() - hybridPlotWorld.ROAD_OFFSET_Z;
126
+
112
127
  // The relative X-coordinate (within the plot) of the minimum X coordinate
113
128
  // contained in the scoped queue
114
- short relativeOffsetX;
115
- if (bx < 0) {
116
- relativeOffsetX = (short) (hybridPlotWorld.SIZE + (bx % hybridPlotWorld.SIZE));
117
- } else {
118
- relativeOffsetX = (short) (bx % hybridPlotWorld.SIZE);
119
- }
129
+ short relativeOffsetX = (short) Math.floorMod(bx, hybridPlotWorld.SIZE);
120
130
  // The relative Z-coordinate (within the plot) of the minimum Z coordinate
121
131
  // contained in the scoped queue
122
- short relativeOffsetZ;
123
- if (bz < 0) {
124
- relativeOffsetZ = (short) (hybridPlotWorld.SIZE + (bz % hybridPlotWorld.SIZE));
125
- } else {
126
- relativeOffsetZ = (short) (bz % hybridPlotWorld.SIZE);
127
- }
132
+ short relativeOffsetZ = (short) Math.floorMod(bz, hybridPlotWorld.SIZE);
133
+
128
134
  // The X-coordinate of a given X coordinate, relative to the
129
135
  // plot (Counting from the corner with the least positive
130
136
  // coordinates)
@@ -171,7 +177,7 @@ public class HybridGen extends IndependentPlotGenerator {
171
177
  result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
172
178
  }
173
179
  if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
174
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
180
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, roadFeatures);
175
181
  }
176
182
  }
177
183
  } else if (insideWallX[x]) {
@@ -182,7 +188,7 @@ public class HybridGen extends IndependentPlotGenerator {
182
188
  result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
183
189
  }
184
190
  if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
185
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
191
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, roadFeatures);
186
192
  }
187
193
  } else {
188
194
  // wall
@@ -194,7 +200,7 @@ public class HybridGen extends IndependentPlotGenerator {
194
200
  result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z, hybridPlotWorld.WALL_BLOCK.toPattern());
195
201
  }
196
202
  } else {
197
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
203
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, roadFeatures);
198
204
  }
199
205
  }
200
206
  }
@@ -206,7 +212,7 @@ public class HybridGen extends IndependentPlotGenerator {
206
212
  result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
207
213
  }
208
214
  if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
209
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
215
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, roadFeatures);
210
216
  }
211
217
  } else if (insideWallZ[z]) {
212
218
  // wall
@@ -218,7 +224,7 @@ public class HybridGen extends IndependentPlotGenerator {
218
224
  result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z, hybridPlotWorld.WALL_BLOCK.toPattern());
219
225
  }
220
226
  } else {
221
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
227
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, roadFeatures);
222
228
  }
223
229
  } else {
224
230
  // plot
@@ -227,7 +233,7 @@ public class HybridGen extends IndependentPlotGenerator {
227
233
  }
228
234
  result.setBlock(x, hybridPlotWorld.PLOT_HEIGHT, z, hybridPlotWorld.TOP_BLOCK.toPattern());
229
235
  if (hybridPlotWorld.PLOT_SCHEMATIC) {
230
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, false, false);
236
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, plotFeatures);
231
237
  }
232
238
  }
233
239
  }
@@ -236,31 +242,26 @@ public class HybridGen extends IndependentPlotGenerator {
236
242
  }
237
243
 
238
244
  @Override
239
- public boolean populateChunk(final ScopedQueueCoordinator result, final PlotArea settings) {
245
+ public void populateChunk(final ZeroedDelegateScopedQueueCoordinator result, final PlotArea settings) {
240
246
  HybridPlotWorld hybridPlotWorld = (HybridPlotWorld) settings;
241
247
  if (!hybridPlotWorld.populationNeeded()) {
242
- return false;
248
+ return;
243
249
  }
250
+ EnumSet<SchematicFeature> roadFeatures = EnumSet.of(SchematicFeature.POPULATING, SchematicFeature.ROAD);
251
+ EnumSet<SchematicFeature> plotFeatures = EnumSet.of(SchematicFeature.POPULATING);
252
+
244
253
  // Coords
245
254
  Location min = result.getMin();
246
255
  int bx = min.getX() - hybridPlotWorld.ROAD_OFFSET_X;
247
256
  int bz = min.getZ() - hybridPlotWorld.ROAD_OFFSET_Z;
257
+
248
258
  // The relative X-coordinate (within the plot) of the minimum X coordinate
249
259
  // contained in the scoped queue
250
- short relativeOffsetX;
251
- if (bx < 0) {
252
- relativeOffsetX = (short) (hybridPlotWorld.SIZE + (bx % hybridPlotWorld.SIZE));
253
- } else {
254
- relativeOffsetX = (short) (bx % hybridPlotWorld.SIZE);
255
- }
260
+ short relativeOffsetX = (short) Math.floorMod(bx, hybridPlotWorld.SIZE);
256
261
  // The relative Z-coordinate (within the plot) of the minimum Z coordinate
257
262
  // contained in the scoped queue
258
- short relativeOffsetZ;
259
- if (bz < 0) {
260
- relativeOffsetZ = (short) (hybridPlotWorld.SIZE + (bz % hybridPlotWorld.SIZE));
261
- } else {
262
- relativeOffsetZ = (short) (bz % hybridPlotWorld.SIZE);
263
- }
263
+ short relativeOffsetZ = (short) Math.floorMod(bz, hybridPlotWorld.SIZE);
264
+
264
265
  boolean allRoad = true;
265
266
  boolean overlap = false;
266
267
 
@@ -313,17 +314,17 @@ public class HybridGen extends IndependentPlotGenerator {
313
314
  if (insideRoadX[x] || insideWallX[x]) {
314
315
  if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
315
316
  for (short z = 0; z < 16; z++) {
316
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, true);
317
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, roadFeatures);
317
318
  }
318
319
  }
319
320
  } else {
320
321
  for (short z = 0; z < 16; z++) {
321
322
  if (insideRoadZ[z] || insideWallZ[z]) {
322
323
  if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
323
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, true);
324
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, roadFeatures);
324
325
  }
325
326
  } else if (hybridPlotWorld.PLOT_SCHEMATIC) {
326
- placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, false, true);
327
+ placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, plotFeatures);
327
328
  }
328
329
  }
329
330
  }
@@ -340,7 +341,10 @@ public class HybridGen extends IndependentPlotGenerator {
340
341
  for (Entity entity : hybridPlotWorld.getPlotSchematicEntities()) {
341
342
  if (region.contains(entity.getLocation().toVector().toBlockPoint())) {
342
343
  Vector3 pos = (entity.getLocation().toVector()
343
- .subtract(region.getMinimumPoint().withY(hybridPlotWorld.getPlotSchematicMinPoint().getY()).toVector3()))
344
+ .subtract(region
345
+ .getMinimumPoint()
346
+ .withY(hybridPlotWorld.getPlotSchematicMinPoint().getY())
347
+ .toVector3()))
344
348
  .add(min.getBlockVector3().withY(hybridPlotWorld.SCHEM_Y).toVector3());
345
349
  result.setEntity(new PopulatingEntity(
346
350
  entity,
@@ -364,7 +368,7 @@ public class HybridGen extends IndependentPlotGenerator {
364
368
  }
365
369
  }
366
370
  }
367
- return true;
371
+ return;
368
372
  }
369
373
 
370
374
  @Override
@@ -377,6 +381,33 @@ public class HybridGen extends IndependentPlotGenerator {
377
381
  // All initialization is done in the PlotArea class
378
382
  }
379
383
 
384
+ @Override
385
+ public BiomeType getBiome(final PlotArea settings, final int worldX, final int worldY, final int worldZ) {
386
+ HybridPlotWorld hybridPlotWorld = (HybridPlotWorld) settings;
387
+ if (!hybridPlotWorld.PLOT_SCHEMATIC && !hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
388
+ return hybridPlotWorld.getPlotBiome();
389
+ }
390
+ int relativeX = worldX;
391
+ int relativeZ = worldZ;
392
+ if (hybridPlotWorld.ROAD_OFFSET_X != 0) {
393
+ relativeX -= hybridPlotWorld.ROAD_OFFSET_X;
394
+ }
395
+ if (hybridPlotWorld.ROAD_OFFSET_Z != 0) {
396
+ relativeZ -= hybridPlotWorld.ROAD_OFFSET_Z;
397
+ }
398
+ int size = hybridPlotWorld.PLOT_WIDTH + hybridPlotWorld.ROAD_WIDTH;
399
+ relativeX = Math.floorMod(relativeX, size);
400
+ relativeZ = Math.floorMod(relativeZ, size);
401
+ BiomeType biome = hybridPlotWorld.G_SCH_B.get(MathMan.pair((short) relativeX, (short) relativeZ));
402
+ return biome == null ? hybridPlotWorld.getPlotBiome() : biome;
403
+ }
404
+
405
+ private enum SchematicFeature {
406
+ BIOMES,
407
+ ROAD,
408
+ POPULATING
409
+ }
410
+
380
411
  /**
381
412
  * Wrapper to allow a WorldEdit {@link Entity} to effectively have a mutable location as the location in its NBT should be changed
382
413
  * when set to the world.
Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java CHANGED
@@ -141,7 +141,11 @@ public class HybridPlotManager extends ClassicPlotManager {
141
141
  (pos1.getX() + pos2.getX()) / 2,
142
142
  (pos1.getZ() + pos2.getZ()) / 2
143
143
  ), biome)) {
144
- WorldUtil.setBiome(hybridPlotWorld.getWorldName(), new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()), biome);
144
+ WorldUtil.setBiome(
145
+ hybridPlotWorld.getWorldName(),
146
+ new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()),
147
+ biome
148
+ );
145
149
  }
146
150
  }
147
151
 
@@ -203,8 +207,18 @@ public class HybridPlotManager extends ClassicPlotManager {
203
207
  PlotId id2 = PlotId.of(id.getX(), id.getY() + 1);
204
208
  Location bot = getPlotBottomLocAbs(id2);
205
209
  Location top = getPlotTopLocAbs(id);
206
- Location pos1 = Location.at(hybridPlotWorld.getWorldName(), bot.getX() - 1, hybridPlotWorld.getMinGenHeight(), top.getZ() + 1);
207
- Location pos2 = Location.at(hybridPlotWorld.getWorldName(), top.getX() + 1, hybridPlotWorld.getMaxGenHeight(), bot.getZ());
210
+ Location pos1 = Location.at(
211
+ hybridPlotWorld.getWorldName(),
212
+ bot.getX() - 1,
213
+ hybridPlotWorld.getMinGenHeight(),
214
+ top.getZ() + 1
215
+ );
216
+ Location pos2 = Location.at(
217
+ hybridPlotWorld.getWorldName(),
218
+ top.getX() + 1,
219
+ hybridPlotWorld.getMaxGenHeight(),
220
+ bot.getZ()
221
+ );
208
222
  this.resetBiome(hybridPlotWorld, pos1, pos2);
209
223
  if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
210
224
  return true;
@@ -274,6 +288,13 @@ public class HybridPlotManager extends ClassicPlotManager {
274
288
  queue.setCompleteTask(whenDone);
275
289
  }
276
290
  if (!canRegen) {
291
+ if (hybridPlotWorld.getMinBuildHeight() < hybridPlotWorld.getMinGenHeight()) {
292
+ queue.setCuboid(
293
+ pos1.withY(hybridPlotWorld.getMinBuildHeight()),
294
+ pos2.withY(hybridPlotWorld.getMinGenHeight()),
295
+ BlockTypes.AIR.getDefaultState()
296
+ );
297
+ }
277
298
  queue.setCuboid(
278
299
  pos1.withY(hybridPlotWorld.getMinGenHeight()),
279
300
  pos2.withY(hybridPlotWorld.getMinGenHeight()),
@@ -291,6 +312,13 @@ public class HybridPlotManager extends ClassicPlotManager {
291
312
  pos2.withY(hybridPlotWorld.getMaxGenHeight()),
292
313
  BlockTypes.AIR.getDefaultState()
293
314
  );
315
+ if (hybridPlotWorld.getMaxGenHeight() < hybridPlotWorld.getMaxBuildHeight() - 1) {
316
+ queue.setCuboid(
317
+ pos1.withY(hybridPlotWorld.getMaxGenHeight()),
318
+ pos2.withY(hybridPlotWorld.getMaxBuildHeight() - 1),
319
+ BlockTypes.AIR.getDefaultState()
320
+ );
321
+ }
294
322
  queue.setBiomeCuboid(pos1, pos2, biome);
295
323
  } else {
296
324
  queue.setRegenRegion(new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()));
Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java CHANGED
@@ -68,8 +68,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
68
68
  private static final AffineTransform transform = new AffineTransform().rotateY(90);
69
69
  public boolean ROAD_SCHEMATIC_ENABLED;
70
70
  public boolean PLOT_SCHEMATIC = false;
71
- @Deprecated(forRemoval = true, since = "6.9.0")
72
- public int PLOT_SCHEMATIC_HEIGHT = -1;
73
71
  public short PATH_WIDTH_LOWER;
74
72
  public short PATH_WIDTH_UPPER;
75
73
  public HashMap<Integer, BaseBlock[]> G_SCH;
@@ -104,22 +102,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
104
102
  PlotSquared.platform().injector().injectMembers(this);
105
103
  }
106
104
 
107
- @Deprecated(forRemoval = true, since = "6.9.0")
108
- public static byte wrap(byte data, int start) {
109
- if ((data >= start) && (data < (start + 4))) {
110
- data = (byte) ((((data - start) + 2) & 3) + start);
111
- }
112
- return data;
113
- }
114
-
115
- @Deprecated(forRemoval = true, since = "6.9.0")
116
- public static byte wrap2(byte data, int start) {
117
- if ((data >= start) && (data < (start + 2))) {
118
- data = (byte) ((((data - start) + 1) & 1) + start);
119
- }
120
- return data;
121
- }
122
-
123
105
  public static BaseBlock rotate(BaseBlock id) {
124
106
 
125
107
  CompoundTag tag = id.getNbtData();
@@ -341,7 +323,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
341
323
  short w3 = (short) d3.getX();
342
324
  short l3 = (short) d3.getZ();
343
325
  short h3 = (short) d3.getY();
344
- if (w3 > PLOT_WIDTH || h3 > PLOT_WIDTH) {
326
+ if (w3 > PLOT_WIDTH || l3 > PLOT_WIDTH) {
345
327
  this.ROAD_SCHEMATIC_ENABLED = true;
346
328
  }
347
329
  int centerShiftZ;
@@ -396,7 +378,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
396
378
  }
397
379
  if ((schematic1 == null && schematic2 == null) || this.ROAD_WIDTH == 0) {
398
380
  if (Settings.DEBUG) {
399
- LOGGER.info("- schematic: false");
381
+ LOGGER.info("- road schematic: false");
400
382
  }
401
383
  return;
402
384
  }
@@ -486,11 +468,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
486
468
  }
487
469
  }
488
470
 
489
- /**
490
- * @deprecated This method should not be available for public API usage and will be made private.
491
- */
492
- @Deprecated(forRemoval = true, since = "6.10.2")
493
- public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
471
+ private void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
494
472
  if (z < 0) {
495
473
  z += this.SIZE;
496
474
  } else if (z >= this.SIZE) {
@@ -521,11 +499,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
521
499
  existing[y] = id;
522
500
  }
523
501
 
524
- /**
525
- * @deprecated This method should not be available for public API usage and will be made private.
526
- */
527
- @Deprecated(forRemoval = true, since = "6.10.2")
528
- public void addOverlayBiome(short x, short z, BiomeType id) {
502
+ private void addOverlayBiome(short x, short z, BiomeType id) {
529
503
  if (z < 0) {
530
504
  z += this.SIZE;
531
505
  } else if (z >= this.SIZE) {
@@ -570,14 +544,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
570
544
  return schem1PopulationNeeded || schem2PopulationNeeded || schem3PopulationNeeded;
571
545
  }
572
546
 
573
- /**
574
- * @deprecated in favour of {@link HybridPlotWorld#getSchematicRoot()}
575
- */
576
- @Deprecated(forRemoval = true, since = "6.9.0")
577
- public File getRoot() {
578
- return this.root;
579
- }
580
-
581
547
  /**
582
548
  * Get the root folder for this world's generation schematics. May be null if schematics not initialised via
583
549
  * {@link HybridPlotWorld#setupSchematics()}
Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java CHANGED
@@ -63,7 +63,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
63
63
  import java.io.File;
64
64
  import java.util.ArrayDeque;
65
65
  import java.util.ArrayList;
66
- import java.util.Arrays;
67
66
  import java.util.Collections;
68
67
  import java.util.HashSet;
69
68
  import java.util.Iterator;
@@ -163,7 +162,7 @@ public class HybridUtils {
163
162
  int relChunkZ = chunkPos.getZ() - cbz;
164
163
  oldBlockQueue.setOffsetX(relChunkX << 4);
165
164
  oldBlockQueue.setOffsetZ(relChunkZ << 4);
166
- hpw.getGenerator().generateChunk(oldBlockQueue, hpw);
165
+ hpw.getGenerator().generateChunk(oldBlockQueue, hpw, false);
167
166
  });
168
167
 
169
168
  final BlockState[][][] oldBlocks = oldBlockQueue.getBlockStates();
@@ -380,26 +379,6 @@ public class HybridUtils {
380
379
  run.run();
381
380
  }
382
381
 
383
- /**
384
- * @deprecated Unused internally and poor implementation. Scheduled for removal in next major release.
385
- */
386
- @Deprecated(forRemoval = true, since = "6.11.1")
387
- public int checkModified(QueueCoordinator queue, int x1, int x2, int y1, int y2, int z1, int z2, BlockState[] blocks) {
388
- int count = 0;
389
- for (int y = y1; y <= y2; y++) {
390
- for (int x = x1; x <= x2; x++) {
391
- for (int z = z1; z <= z2; z++) {
392
- BlockState block = queue.getBlock(x, y, z);
393
- boolean same = Arrays.stream(blocks).anyMatch(p -> this.worldUtil.isBlockSame(block, p));
394
- if (!same) {
395
- count++;
396
- }
397
- }
398
- }
399
- }
400
- return count;
401
- }
402
-
403
382
  public final ArrayList<BlockVector2> getChunks(BlockVector2 region) {
404
383
  ArrayList<BlockVector2> chunks = new ArrayList<>();
405
384
  int sx = region.getX() << 5;
@@ -599,20 +578,6 @@ public class HybridUtils {
599
578
  return ey;
600
579
  }
601
580
 
602
- /**
603
- * Regenerate the road in a chunk in a plot area.
604
- *
605
- * @param area Plot area to regenerate road for
606
- * @param chunk Chunk location to regenerate
607
- * @param extend How far to extend setting air above the road
608
- * @return if successful
609
- * @deprecated use {@link HybridUtils#regenerateRoad(PlotArea, BlockVector2, int, QueueCoordinator)}
610
- */
611
- @Deprecated(forRemoval = true, since = "6.6.0")
612
- public boolean regenerateRoad(final PlotArea area, final BlockVector2 chunk, int extend) {
613
- return regenerateRoad(area, chunk, extend, null);
614
- }
615
-
616
581
  /**
617
582
  * Regenerate the road in a chunk in a plot area.
618
583
  *
Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java CHANGED
@@ -21,8 +21,9 @@ package com.plotsquared.core.generator;
21
21
  import com.plotsquared.core.PlotSquared;
22
22
  import com.plotsquared.core.plot.PlotArea;
23
23
  import com.plotsquared.core.plot.PlotId;
24
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
24
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
25
25
  import com.plotsquared.core.setup.PlotAreaBuilder;
26
+ import com.sk89q.worldedit.world.biome.BiomeType;
26
27
  import org.checkerframework.checker.nullness.qual.NonNull;
27
28
 
28
29
  /**
@@ -42,24 +43,21 @@ public abstract class IndependentPlotGenerator {
42
43
  /**
43
44
  * Generate chunk block data
44
45
  *
45
- * @param result queue
46
+ * @param result Queue to write to
46
47
  * @param settings PlotArea (settings)
47
- * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
48
+ * @param biomes If biomes should be generated
49
+ * @since 7.0.0
48
50
  */
49
- @Deprecated(forRemoval = true, since = "6.9.0")
50
- public abstract void generateChunk(ScopedQueueCoordinator result, PlotArea settings);
51
+ public abstract void generateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea settings, boolean biomes);
51
52
 
52
53
  /**
53
- * Populates the queue representing a chunk area with tile entities and entities
54
+ * Populate a chunk-queue with tile entities, entities, etc.
54
55
  *
55
- * @param result Queue to write to
56
- * @param settings PlotArea (settings)
57
- * @return True if any population occurred
58
- * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
56
+ * @param result Queue to write to
57
+ * @param setting PlotArea (settings)
58
+ * @since 7.0.0
59
59
  */
60
- @Deprecated(forRemoval = true, since = "6.9.0")
61
- public boolean populateChunk(ScopedQueueCoordinator result, PlotArea settings) {
62
- return false;
60
+ public void populateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea setting) {
63
61
  }
64
62
 
65
63
  /**
@@ -102,6 +100,18 @@ public abstract class IndependentPlotGenerator {
102
100
  return (GeneratorWrapper<T>) PlotSquared.platform().wrapPlotGenerator(world, this);
103
101
  }
104
102
 
103
+ /**
104
+ * Get the biome to be generated at a specific point
105
+ *
106
+ * @param settings PlotArea settings to provide biome
107
+ * @param x World x position
108
+ * @param y World y position
109
+ * @param z World z position
110
+ * @return Biome type to be generated
111
+ * @since 7.0.0
112
+ */
113
+ public abstract BiomeType getBiome(PlotArea settings, int x, int y, int z);
114
+
105
115
  @Override
106
116
  public String toString() {
107
117
  return getName();
Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java CHANGED
@@ -25,8 +25,10 @@ import com.plotsquared.core.plot.PlotId;
25
25
  import com.plotsquared.core.plot.world.PlotAreaManager;
26
26
  import com.plotsquared.core.plot.world.SinglePlotArea;
27
27
  import com.plotsquared.core.plot.world.SinglePlotAreaManager;
28
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
28
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
29
+ import com.sk89q.worldedit.world.biome.BiomeType;
29
30
  import com.sk89q.worldedit.world.biome.BiomeTypes;
31
+ import com.sk89q.worldedit.world.block.BlockState;
30
32
  import com.sk89q.worldedit.world.block.BlockTypes;
31
33
  import org.checkerframework.checker.nullness.qual.NonNull;
32
34
 
@@ -38,6 +40,9 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
38
40
  private static final Location dirt2 = Location.at("", 15, 2, 15);
39
41
  private static final Location grass1 = Location.at("", 0, 3, 0);
40
42
  private static final Location grass2 = Location.at("", 15, 3, 15);
43
+ private static final BlockState BEDROCK = BlockTypes.BEDROCK.getDefaultState();
44
+ private static final BlockState DIRT = BlockTypes.DIRT.getDefaultState();
45
+ private static final BlockState GRASS_BLOCK = BlockTypes.GRASS_BLOCK.getDefaultState();
41
46
 
42
47
  private final PlotAreaManager plotAreaManager;
43
48
 
@@ -52,19 +57,21 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
52
57
  }
53
58
 
54
59
  @Override
55
- public void generateChunk(ScopedQueueCoordinator result, PlotArea settings) {
60
+ public void generateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea settings, boolean biomes) {
56
61
  SinglePlotArea area = (SinglePlotArea) settings;
57
62
  if (area.VOID) {
58
63
  Location min = result.getMin();
59
64
  if (min.getX() == 0 && min.getZ() == 0) {
60
- result.setBlock(0, 0, 0, BlockTypes.BEDROCK.getDefaultState());
65
+ result.setBlock(0, 0, 0, BEDROCK);
61
66
  }
62
67
  } else {
63
- result.setCuboid(bedrock1, bedrock2, BlockTypes.BEDROCK.getDefaultState());
64
- result.setCuboid(dirt1, dirt2, BlockTypes.DIRT.getDefaultState());
65
- result.setCuboid(grass1, grass2, BlockTypes.GRASS_BLOCK.getDefaultState());
68
+ result.setCuboid(bedrock1, bedrock2, BEDROCK);
69
+ result.setCuboid(dirt1, dirt2, DIRT);
70
+ result.setCuboid(grass1, grass2, GRASS_BLOCK);
71
+ }
72
+ if (biomes) {
73
+ result.fillBiome(BiomeTypes.PLAINS);
66
74
  }
67
- result.fillBiome(BiomeTypes.PLAINS);
68
75
  }
69
76
 
70
77
  @Override
@@ -76,4 +83,9 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
76
83
  public void initialize(PlotArea area) {
77
84
  }
78
85
 
86
+ @Override
87
+ public BiomeType getBiome(final PlotArea settings, final int x, final int y, final int z) {
88
+ return BiomeTypes.PLAINS;
89
+ }
90
+
79
91
  }
Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java CHANGED
@@ -185,30 +185,38 @@ public abstract class SquarePlotManager extends GridPlotManager {
185
185
  return null;
186
186
  }
187
187
  switch (hash) {
188
- case 8:
188
+ case 8 -> {
189
189
  // north
190
190
  return plot.isMerged(Direction.NORTH) ? id : null;
191
- case 4:
191
+ }
192
+ case 4 -> {
192
193
  // east
193
194
  return plot.isMerged(Direction.EAST) ? id : null;
194
- case 2:
195
+ }
196
+ case 2 -> {
195
197
  // south
196
198
  return plot.isMerged(Direction.SOUTH) ? id : null;
197
- case 1:
199
+ }
200
+ case 1 -> {
198
201
  // west
199
202
  return plot.isMerged(Direction.WEST) ? id : null;
200
- case 12:
203
+ }
204
+ case 12 -> {
201
205
  // northeast
202
206
  return plot.isMerged(Direction.NORTHEAST) ? id : null;
203
- case 6:
207
+ }
208
+ case 6 -> {
204
209
  // southeast
205
210
  return plot.isMerged(Direction.SOUTHEAST) ? id : null;
206
- case 3:
211
+ }
212
+ case 3 -> {
207
213
  // southwest
208
214
  return plot.isMerged(Direction.SOUTHWEST) ? id : null;
209
- case 9:
215
+ }
216
+ case 9 -> {
210
217
  // northwest
211
218
  return plot.isMerged(Direction.NORTHWEST) ? id : null;
219
+ }
212
220
  }
213
221
  } catch (Exception ignored) {
214
222
  LOGGER.error("Invalid plot / road width in settings.yml for world: {}", squarePlotWorld.getWorldName());
Core/src/main/java/com/plotsquared/core/listener/PlotListener.java CHANGED
@@ -23,7 +23,6 @@ import com.plotsquared.core.configuration.Settings;
23
23
  import com.plotsquared.core.configuration.caption.Caption;
24
24
  import com.plotsquared.core.configuration.caption.StaticCaption;
25
25
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
26
- import com.plotsquared.core.database.DBFunc;
27
26
  import com.plotsquared.core.events.PlotFlagRemoveEvent;
28
27
  import com.plotsquared.core.events.Result;
29
28
  import com.plotsquared.core.location.Location;
@@ -63,8 +62,11 @@ import com.sk89q.worldedit.world.gamemode.GameMode;
63
62
  import com.sk89q.worldedit.world.gamemode.GameModes;
64
63
  import com.sk89q.worldedit.world.item.ItemType;
65
64
  import com.sk89q.worldedit.world.item.ItemTypes;
65
+ import net.kyori.adventure.text.Component;
66
+ import net.kyori.adventure.text.ComponentLike;
66
67
  import net.kyori.adventure.text.minimessage.MiniMessage;
67
- import net.kyori.adventure.text.minimessage.Template;
68
+ import net.kyori.adventure.text.minimessage.tag.Tag;
69
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
68
70
  import org.checkerframework.checker.nullness.qual.NonNull;
69
71
  import org.checkerframework.checker.nullness.qual.Nullable;
70
72
 
@@ -75,11 +77,10 @@ import java.util.List;
75
77
  import java.util.Map;
76
78
  import java.util.Optional;
77
79
  import java.util.UUID;
78
- import java.util.function.Consumer;
79
80
 
80
81
  public class PlotListener {
81
82
 
82
- private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
83
+ private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
83
84
 
84
85
  private final HashMap<UUID, Interval> feedRunnable = new HashMap<>();
85
86
  private final HashMap<UUID, Interval> healRunnable = new HashMap<>();
@@ -141,7 +142,9 @@ public class PlotListener {
141
142
  Map.Entry<UUID, List<StatusEffect>> entry = iterator.next();
142
143
  List<StatusEffect> effects = entry.getValue();
143
144
  effects.removeIf(effect -> currentTime > effect.expiresAt);
144
- if (effects.isEmpty()) iterator.remove();
145
+ if (effects.isEmpty()) {
146
+ iterator.remove();
147
+ }
145
148
  }
146
149
  }
147
150
  }, TaskTime.seconds(1L));
@@ -151,7 +154,7 @@ public class PlotListener {
151
154
  if (plot.isDenied(player.getUUID()) && !player.hasPermission("plots.admin.entry.denied")) {
152
155
  player.sendMessage(
153
156
  TranslatableCaption.of("deny.no_enter"),
154
- Template.of("plot", plot.toString())
157
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
155
158
  );
156
159
  return false;
157
160
  }
@@ -219,8 +222,10 @@ public class PlotListener {
219
222
  } else {
220
223
  player.sendMessage(
221
224
  TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
222
- Template.of("gamemode", String.valueOf(gameMode)),
223
- Template.of("plot", plot.getId().toString())
225
+ TagResolver.builder()
226
+ .tag("gamemode", Tag.inserting(Component.text(gameMode.toString())))
227
+ .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
228
+ .build()
224
229
  );
225
230
  }
226
231
  }
@@ -234,8 +239,10 @@ public class PlotListener {
234
239
  } else {
235
240
  player.sendMessage(
236
241
  TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
237
- Template.of("gamemode", String.valueOf(guestGameMode)),
238
- Template.of("plot", plot.getId().toString())
242
+ TagResolver.builder()
243
+ .tag("gamemode", Tag.inserting(Component.text(guestGameMode.toString())))
244
+ .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
245
+ .build()
239
246
  );
240
247
  }
241
248
  }
@@ -314,39 +321,21 @@ public class PlotListener {
314
321
  }
315
322
  if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
316
323
  final UUID plotOwner = plot.getOwnerAbs();
317
- String owner = PlayerManager.resolveName(plotOwner, true).getComponent(player);
324
+ ComponentLike owner = PlayerManager.resolveName(plotOwner, true).toComponent(player);
318
325
  Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
319
326
  ".title_entered_plot");
320
327
  Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
321
328
  ".title_entered_plot_sub");
322
- Template plotTemplate = Template.of("plot", lastPlot.getId().toString());
323
- Template worldTemplate = Template.of("world", player.getLocation().getWorldName());
324
- Template ownerTemplate = Template.of("owner", owner);
325
- Template aliasTemplate = Template.of("alias", plot.getAlias());
326
-
327
- final Consumer<String> userConsumer = user -> {
328
- if (Settings.Titles.TITLES_AS_ACTIONBAR) {
329
- player.sendActionBar(header, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
330
- } else {
331
- player.sendTitle(header, subHeader, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
332
- }
333
- };
334
-
335
- UUID uuid = plot.getOwner();
336
- if (uuid == null) {
337
- userConsumer.accept("Unknown");
338
- } else if (uuid.equals(DBFunc.SERVER)) {
339
- userConsumer.accept(MINI_MESSAGE.stripTokens(TranslatableCaption
340
- .of("info.server")
341
- .getComponent(player)));
329
+ TagResolver resolver = TagResolver.builder()
330
+ .tag("plot", Tag.inserting(Component.text(lastPlot.getId().toString())))
331
+ .tag("world", Tag.inserting(Component.text(player.getLocation().getWorldName())))
332
+ .tag("owner", Tag.inserting(owner))
333
+ .tag("alias", Tag.inserting(Component.text(plot.getAlias())))
334
+ .build();
335
+ if (Settings.Titles.TITLES_AS_ACTIONBAR) {
336
+ player.sendActionBar(header, resolver);
342
337
  } else {
343
- PlotSquared.get().getImpromptuUUIDPipeline().getSingle(plot.getOwner(), (user, throwable) -> {
344
- if (throwable != null) {
345
- userConsumer.accept("Unknown");
346
- } else {
347
- userConsumer.accept(user);
348
- }
349
- });
338
+ player.sendTitle(header, subHeader, resolver);
350
339
  }
351
340
  }
352
341
  }, TaskTime.seconds(1L));
@@ -354,14 +343,14 @@ public class PlotListener {
354
343
  }
355
344
 
356
345
  TimedFlag.Timed<Integer> feed = plot.getFlag(FeedFlag.class);
357
- if (feed.getInterval() != 0 && feed.getValue() != 0) {
346
+ if (feed.interval() != 0 && feed.value() != 0) {
358
347
  feedRunnable
359
- .put(player.getUUID(), new Interval(feed.getInterval(), feed.getValue(), 20));
348
+ .put(player.getUUID(), new Interval(feed.interval(), feed.value(), 20));
360
349
  }
361
350
  TimedFlag.Timed<Integer> heal = plot.getFlag(HealFlag.class);
362
- if (heal.getInterval() != 0 && heal.getValue() != 0) {
351
+ if (heal.interval() != 0 && heal.value() != 0) {
363
352
  healRunnable
364
- .put(player.getUUID(), new Interval(heal.getInterval(), heal.getValue(), 20));
353
+ .put(player.getUUID(), new Interval(heal.interval(), heal.value(), 20));
365
354
  }
366
355
  return true;
367
356
  }
@@ -406,8 +395,10 @@ public class PlotListener {
406
395
  } else {
407
396
  player.sendMessage(
408
397
  TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
409
- Template.of("gamemode", pw.getGameMode().getName().toLowerCase()),
410
- Template.of("plot", plot.toString())
398
+ TagResolver.builder()
399
+ .tag("gamemode", Tag.inserting(Component.text(pw.getGameMode().toString())))
400
+ .tag("plot", Tag.inserting(Component.text(plot.toString())))
401
+ .build()
411
402
  );
412
403
  }
413
404
  }
@@ -477,13 +468,15 @@ public class PlotListener {
477
468
  }
478
469
 
479
470
  private void notifyPlotOwner(final PlotPlayer<?> player, final Plot plot, final PlotPlayer<?> owner, final Caption caption) {
480
- Template playerTemplate = Template.of("player", player.getName());
481
- Template plotTemplate = Template.of("plot", plot.getId().toString());
482
- Template areaTemplate = Template.of("area", plot.getArea().toString());
471
+ TagResolver resolver = TagResolver.builder()
472
+ .tag("player", Tag.inserting(Component.text(player.getName())))
473
+ .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
474
+ .tag("area", Tag.inserting(Component.text(String.valueOf(plot.getArea()))))
475
+ .build();
483
476
  if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
484
- owner.sendMessage(caption, playerTemplate, plotTemplate, areaTemplate);
477
+ owner.sendMessage(caption, resolver);
485
478
  } else {
486
- owner.sendActionBar(caption, playerTemplate, plotTemplate, areaTemplate);
479
+ owner.sendActionBar(caption, resolver);
487
480
  }
488
481
  }
489
482
 
@@ -495,8 +488,9 @@ public class PlotListener {
495
488
 
496
489
  /**
497
490
  * Marks an effect as a status effect that will be removed on leaving a plot
498
- * @param uuid The uuid of the player the effect belongs to
499
- * @param name The name of the status effect
491
+ *
492
+ * @param uuid The uuid of the player the effect belongs to
493
+ * @param name The name of the status effect
500
494
  * @param expiresAt The time when the effect expires
501
495
  * @since 6.10.0
502
496
  */
@@ -527,10 +521,10 @@ public class PlotListener {
527
521
  private record StatusEffect(@NonNull String name, long expiresAt) {
528
522
 
529
523
  private StatusEffect(@NonNull String name, long expiresAt) {
530
- this.name = name;
531
- this.expiresAt = expiresAt;
532
- }
533
-
524
+ this.name = name;
525
+ this.expiresAt = expiresAt;
534
526
  }
535
527
 
528
+ }
529
+
536
530
  }
Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java CHANGED
@@ -38,7 +38,9 @@ import com.sk89q.worldedit.util.Location;
38
38
  import com.sk89q.worldedit.util.eventbus.EventHandler.Priority;
39
39
  import com.sk89q.worldedit.util.eventbus.Subscribe;
40
40
  import com.sk89q.worldedit.world.World;
41
- import net.kyori.adventure.text.minimessage.Template;
41
+ import net.kyori.adventure.text.Component;
42
+ import net.kyori.adventure.text.minimessage.tag.Tag;
43
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
42
44
  import org.checkerframework.checker.nullness.qual.NonNull;
43
45
 
44
46
  import java.util.Set;
@@ -94,7 +96,7 @@ public class WESubscriber {
94
96
  if (plotPlayer.hasPermission("plots.worldedit.bypass")) {
95
97
  plotPlayer.sendMessage(
96
98
  TranslatableCaption.of("worldedit.worldedit_bypass"),
97
- Template.of("command", "/plot toggle worldedit")
99
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot toggle worldedit")))
98
100
  );
99
101
  }
100
102
  if (this.plotAreaManager.hasPlotArea(world)) {
Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java CHANGED
@@ -21,17 +21,11 @@ package com.plotsquared.core.location;
21
21
  import com.plotsquared.core.util.MathMan;
22
22
  import com.plotsquared.core.util.StringMan;
23
23
 
24
- public class ChunkWrapper {
25
-
26
- public final int x;
27
- public final int z;
28
- public final String world;
29
-
30
- public ChunkWrapper(String world, int x, int z) {
31
- this.world = world;
32
- this.x = x;
33
- this.z = z;
34
- }
24
+ public record ChunkWrapper(
25
+ String world,
26
+ int x,
27
+ int z
28
+ ) {
35
29
 
36
30
  @Override
37
31
  public int hashCode() {
Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java CHANGED
@@ -51,7 +51,6 @@ public final class UncheckedWorldLocation extends Location {
51
51
  * @param y Y coordinate
52
52
  * @param z Z coordinate
53
53
  * @return New location
54
- *
55
54
  * @since 6.9.0
56
55
  */
57
56
  @DoNotUse
Core/src/main/java/com/plotsquared/core/permissions/Permission.java CHANGED
@@ -18,22 +18,21 @@
18
18
  */
19
19
  package com.plotsquared.core.permissions;
20
20
 
21
+ import net.kyori.adventure.text.Component;
22
+ import net.kyori.adventure.text.ComponentLike;
21
23
  import org.checkerframework.checker.nullness.qual.NonNull;
24
+ import org.jetbrains.annotations.NotNull;
22
25
 
23
26
  /**
24
27
  * Permission class.
25
28
  */
26
- public enum Permission {
29
+ public enum Permission implements ComponentLike {
27
30
 
28
31
  //@formatter:off
29
32
  //<editor-fold desc="Static Permission">
30
33
  PERMISSION_STAR("*"),
31
34
  PERMISSION_ADMIN("plots.admin"),
32
35
  PERMISSION_ADMIN_AREA_SUDO("plots.admin.area.sudo"),
33
- @Deprecated(forRemoval = true, since = "6.2.2")
34
- PERMISSION_PROJECTILE_UNOWNED("plots.projectile.unowned"),
35
- @Deprecated(forRemoval = true, since = "6.2.2")
36
- PERMISSION_PROJECTILE_OTHER("plots.projectile.other"),
37
36
  PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS("plots.admin.interact.blockedcommands"),
38
37
  PERMISSION_WORLDEDIT_BYPASS("plots.worldedit.bypass"),
39
38
  PERMISSION_PLOT_TOGGLE_TITLES("plots.toggle.titles"),
@@ -219,4 +218,9 @@ public enum Permission {
219
218
  return String.format(this.toString(), replacements);
220
219
  }
221
220
 
221
+ @Override
222
+ public @NotNull Component asComponent() {
223
+ return Component.text(text);
224
+ }
225
+
222
226
  }
Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java CHANGED
@@ -42,7 +42,7 @@ import com.sk89q.worldedit.world.gamemode.GameModes;
42
42
  import com.sk89q.worldedit.world.item.ItemType;
43
43
  import net.kyori.adventure.audience.Audience;
44
44
  import net.kyori.adventure.text.minimessage.MiniMessage;
45
- import net.kyori.adventure.text.minimessage.Template;
45
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
46
46
  import org.checkerframework.checker.nullness.qual.NonNull;
47
47
 
48
48
  import java.util.UUID;
@@ -110,7 +110,7 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
110
110
  @Override
111
111
  public void sendTitle(
112
112
  final @NonNull Caption title, final @NonNull Caption subtitle,
113
- final int fadeIn, final int stay, final int fadeOut, final @NonNull Template... replacements
113
+ final int fadeIn, final int stay, final int fadeOut, final @NonNull TagResolver... resolvers
114
114
  ) {
115
115
  }
116
116
 
@@ -144,7 +144,7 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
144
144
  @Override
145
145
  public void sendMessage(
146
146
  final @NonNull Caption caption,
147
- final @NonNull Template... replacements
147
+ final @NonNull TagResolver... replacements
148
148
  ) {
149
149
  String message = caption.getComponent(this);
150
150
  if (message.isEmpty()) {
@@ -154,7 +154,7 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
154
154
  .replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&')
155
155
  .replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this));
156
156
  // Parse the message
157
- PlotSquared.platform().consoleAudience().sendMessage(MINI_MESSAGE.parse(message, replacements));
157
+ PlotSquared.platform().consoleAudience().sendMessage(MINI_MESSAGE.deserialize(message, replacements));
158
158
  }
159
159
 
160
160
  @Override
Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java CHANGED
@@ -57,7 +57,8 @@ import com.sk89q.worldedit.world.item.ItemType;
57
57
  import net.kyori.adventure.audience.Audience;
58
58
  import net.kyori.adventure.text.Component;
59
59
  import net.kyori.adventure.text.minimessage.MiniMessage;
60
- import net.kyori.adventure.text.minimessage.Template;
60
+ import net.kyori.adventure.text.minimessage.tag.Tag;
61
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
61
62
  import net.kyori.adventure.title.Title;
62
63
  import org.apache.logging.log4j.LogManager;
63
64
  import org.apache.logging.log4j.Logger;
@@ -205,7 +206,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
205
206
  if (notify) {
206
207
  sendMessage(
207
208
  TranslatableCaption.of("permission.no_permission_event"),
208
- Template.of("node", permission)
209
+ TagResolver.resolver("node", Tag.inserting(Component.text(permission)))
209
210
  );
210
211
  }
211
212
  return false;
@@ -849,7 +850,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
849
850
  */
850
851
  public void sendTitle(
851
852
  final @NonNull Caption title, final @NonNull Caption subtitle,
852
- final @NonNull Template... replacements
853
+ final @NonNull TagResolver... replacements
853
854
  ) {
854
855
  sendTitle(
855
856
  title,
@@ -874,11 +875,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
874
875
  public void sendTitle(
875
876
  final @NonNull Caption title, final @NonNull Caption subtitle,
876
877
  final int fadeIn, final int stay, final int fadeOut,
877
- final @NonNull Template... replacements
878
+ final @NonNull TagResolver... replacements
878
879
  ) {
879
- final Component titleComponent = MiniMessage.get().parse(title.getComponent(this), replacements);
880
+ final Component titleComponent = MiniMessage.miniMessage().deserialize(title.getComponent(this), replacements);
880
881
  final Component subtitleComponent =
881
- MiniMessage.get().parse(subtitle.getComponent(this), replacements);
882
+ MiniMessage.miniMessage().deserialize(subtitle.getComponent(this), replacements);
882
883
  final Title.Times times = Title.Times.of(
883
884
  Duration.of(Settings.Titles.TITLES_FADE_IN * 50L, ChronoUnit.MILLIS),
884
885
  Duration.of(Settings.Titles.TITLES_STAY * 50L, ChronoUnit.MILLIS),
@@ -896,7 +897,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
896
897
  */
897
898
  public void sendActionBar(
898
899
  final @NonNull Caption caption,
899
- final @NonNull Template... replacements
900
+ final @NonNull TagResolver... replacements
900
901
  ) {
901
902
  String message;
902
903
  try {
@@ -916,14 +917,14 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
916
917
  .replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this));
917
918
 
918
919
 
919
- final Component component = MiniMessage.get().parse(message, replacements);
920
+ final Component component = MiniMessage.miniMessage().deserialize(message, replacements);
920
921
  getAudience().sendActionBar(component);
921
922
  }
922
923
 
923
924
  @Override
924
925
  public void sendMessage(
925
926
  final @NonNull Caption caption,
926
- final @NonNull Template... replacements
927
+ final @NonNull TagResolver... replacements
927
928
  ) {
928
929
  String message;
929
930
  try {
@@ -942,7 +943,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
942
943
  .replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&')
943
944
  .replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this));
944
945
  // Parse the message
945
- final Component component = MiniMessage.get().parse(message, replacements);
946
+ final Component component = MiniMessage.miniMessage().deserialize(message, replacements);
946
947
  if (!Objects.equal(component, this.getMeta("lastMessage"))
947
948
  || System.currentTimeMillis() - this.<Long>getMeta("lastMessageTime") > 5000) {
948
949
  setMeta("lastMessage", component);
Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java CHANGED
@@ -110,54 +110,62 @@ public final class BlockBucket implements ConfigurationSerializable {
110
110
  if (isCompiled()) {
111
111
  return;
112
112
  }
113
- this.compiled = true;
114
- String string = this.input.toString();
115
- if (string.isEmpty()) {
116
- this.single = null;
117
- this.pattern = null;
118
- return;
119
- }
120
- // Convert legacy format
121
- boolean legacy = false;
122
- String[] blocksStr = string.split(",(?![^\\(\\[]*[\\]\\)])");
123
- if (blocksStr.length == 1) {
124
- try {
125
- Matcher matcher = regex.matcher(string);
113
+ // Synchronized as BlockBuckets may require compilation asynchronously due to async chunk generation on Paper servers
114
+ synchronized (this) {
115
+ if (isCompiled()) {
116
+ return;
117
+ }
118
+ String string = this.input.toString();
119
+ if (string.isEmpty()) {
120
+ this.single = null;
121
+ this.pattern = null;
122
+ this.compiled = true;
123
+ return;
124
+ }
125
+ // Convert legacy format
126
+ boolean legacy = false;
127
+ String[] blocksStr = string.split(",(?![^\\(\\[]*[\\]\\)])");
128
+ if (blocksStr.length == 1) {
129
+ try {
130
+ Matcher matcher = regex.matcher(string);
131
+ if (matcher.find()) {
132
+ String chanceStr = matcher.group("chance");
133
+ String block = matcher.group("block");
134
+ //noinspection PointlessNullCheck
135
+ if (chanceStr != null && block != null && !MathMan.isInteger(block) && MathMan
136
+ .isInteger(chanceStr)) {
137
+ String namespace = matcher.group("namespace");
138
+ string = (namespace == null ? "" : namespace + ":") + block;
139
+ }
140
+ }
141
+ this.single = BlockUtil.get(string);
142
+ this.pattern = new BlockPattern(single);
143
+ this.compiled = true;
144
+ return;
145
+ } catch (Exception ignore) {
146
+ }
147
+ }
148
+ for (int i = 0; i < blocksStr.length; i++) {
149
+ String entry = blocksStr[i];
150
+ Matcher matcher = regex.matcher(entry);
126
151
  if (matcher.find()) {
127
152
  String chanceStr = matcher.group("chance");
128
- String block = matcher.group("block");
129
153
  //noinspection PointlessNullCheck
130
- if (chanceStr != null && block != null && !MathMan.isInteger(block) && MathMan
131
- .isInteger(chanceStr)) {
132
- String namespace = matcher.group("namespace");
133
- string = (namespace == null ? "" : namespace + ":") + block;
154
+ if (chanceStr != null && MathMan.isInteger(chanceStr)) {
155
+ String[] parts = entry.split(":");
156
+ parts = Arrays.copyOf(parts, parts.length - 1);
157
+ entry = chanceStr + "%" + StringMan.join(parts, ":");
158
+ blocksStr[i] = entry;
159
+ legacy = true;
134
160
  }
135
161
  }
136
- this.single = BlockUtil.get(string);
137
- this.pattern = new BlockPattern(single);
138
- return;
139
- } catch (Exception ignore) {
140
162
  }
141
- }
142
- for (int i = 0; i < blocksStr.length; i++) {
143
- String entry = blocksStr[i];
144
- Matcher matcher = regex.matcher(entry);
145
- if (matcher.find()) {
146
- String chanceStr = matcher.group("chance");
147
- //noinspection PointlessNullCheck
148
- if (chanceStr != null && MathMan.isInteger(chanceStr)) {
149
- String[] parts = entry.split(":");
150
- parts = Arrays.copyOf(parts, parts.length - 1);
151
- entry = chanceStr + "%" + StringMan.join(parts, ":");
152
- blocksStr[i] = entry;
153
- legacy = true;
154
- }
163
+ if (legacy) {
164
+ string = StringMan.join(blocksStr, ",");
155
165
  }
166
+ pattern = PatternUtil.parse(null, string);
167
+ this.compiled = true;
156
168
  }
157
- if (legacy) {
158
- string = StringMan.join(blocksStr, ",");
159
- }
160
- pattern = PatternUtil.parse(null, string);
161
169
  }
162
170
 
163
171
  public boolean isCompiled() {
@@ -207,17 +215,11 @@ public final class BlockBucket implements ConfigurationSerializable {
207
215
  return result;
208
216
  }
209
217
 
210
- private static final class Range {
211
-
212
- private final int min;
213
- private final int max;
214
- private final boolean automatic;
215
-
216
- public Range(int min, int max, boolean automatic) {
217
- this.min = min;
218
- this.max = max;
219
- this.automatic = automatic;
220
- }
218
+ private record Range(
219
+ int min,
220
+ int max,
221
+ boolean automatic
222
+ ) {
221
223
 
222
224
  public int getWeight() {
223
225
  return max - min;
@@ -227,46 +229,6 @@ public final class BlockBucket implements ConfigurationSerializable {
227
229
  return num <= max && num >= min;
228
230
  }
229
231
 
230
- public int getMin() {
231
- return this.min;
232
- }
233
-
234
- public int getMax() {
235
- return this.max;
236
- }
237
-
238
- public boolean equals(final Object o) {
239
- if (o == this) {
240
- return true;
241
- }
242
- if (!(o instanceof final Range other)) {
243
- return false;
244
- }
245
- if (this.getMin() != other.getMin()) {
246
- return false;
247
- }
248
- if (this.getMax() != other.getMax()) {
249
- return false;
250
- }
251
- if (this.isAutomatic() != other.isAutomatic()) {
252
- return false;
253
- }
254
- return true;
255
- }
256
-
257
- public int hashCode() {
258
- final int PRIME = 59;
259
- int result = 1;
260
- result = result * PRIME + this.getMin();
261
- result = result * PRIME + this.getMax();
262
- result = result * PRIME + (this.isAutomatic() ? 79 : 97);
263
- return result;
264
- }
265
-
266
- public boolean isAutomatic() {
267
- return this.automatic;
268
- }
269
-
270
232
  }
271
233
 
272
234
  }
Core/src/main/java/com/plotsquared/core/plot/Plot.java CHANGED
@@ -20,7 +20,6 @@ package com.plotsquared.core.plot;
20
20
 
21
21
  import com.google.common.collect.ImmutableSet;
22
22
  import com.google.common.collect.Lists;
23
- import com.google.common.collect.Sets;
24
23
  import com.google.inject.Inject;
25
24
  import com.plotsquared.core.PlotSquared;
26
25
  import com.plotsquared.core.command.Like;
@@ -40,6 +39,7 @@ import com.plotsquared.core.location.Location;
40
39
  import com.plotsquared.core.permissions.Permission;
41
40
  import com.plotsquared.core.player.ConsolePlayer;
42
41
  import com.plotsquared.core.player.PlotPlayer;
42
+ import com.plotsquared.core.plot.expiration.ExpireManager;
43
43
  import com.plotsquared.core.plot.expiration.PlotAnalysis;
44
44
  import com.plotsquared.core.plot.flag.FlagContainer;
45
45
  import com.plotsquared.core.plot.flag.GlobalFlagContainer;
@@ -68,9 +68,11 @@ import com.sk89q.worldedit.math.BlockVector3;
68
68
  import com.sk89q.worldedit.regions.CuboidRegion;
69
69
  import com.sk89q.worldedit.world.biome.BiomeType;
70
70
  import net.kyori.adventure.text.Component;
71
+ import net.kyori.adventure.text.ComponentLike;
71
72
  import net.kyori.adventure.text.TextComponent;
72
73
  import net.kyori.adventure.text.minimessage.MiniMessage;
73
- import net.kyori.adventure.text.minimessage.Template;
74
+ import net.kyori.adventure.text.minimessage.tag.Tag;
75
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
74
76
  import org.apache.logging.log4j.LogManager;
75
77
  import org.apache.logging.log4j.Logger;
76
78
  import org.checkerframework.checker.nullness.qual.NonNull;
@@ -113,9 +115,6 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
113
115
  */
114
116
  public class Plot {
115
117
 
116
- @Deprecated(forRemoval = true, since = "6.6.0")
117
- public static final int MAX_HEIGHT = 256;
118
-
119
118
  private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Plot.class.getSimpleName());
120
119
  private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
121
120
  private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
@@ -1691,19 +1690,6 @@ public class Plot {
1691
1690
  return base.settings != null && base.settings.getRatings() != null;
1692
1691
  }
1693
1692
 
1694
- @Deprecated(forRemoval = true, since = "6.1.0")
1695
- public boolean claim(final @NonNull PlotPlayer<?> player, boolean teleport, String schematic) {
1696
- if (!canClaim(player)) {
1697
- return false;
1698
- }
1699
- return claim(player, teleport, schematic, true);
1700
- }
1701
-
1702
- @Deprecated(forRemoval = true, since = "6.1.0")
1703
- public boolean claim(final @NonNull PlotPlayer<?> player, boolean teleport, String schematic, boolean updateDB) {
1704
- return claim(player, teleport, schematic, updateDB, false);
1705
- }
1706
-
1707
1693
  /**
1708
1694
  * Claim the plot
1709
1695
  *
@@ -1731,7 +1717,10 @@ public class Plot {
1731
1717
  area.addPlot(this);
1732
1718
  updateWorldBorder();
1733
1719
  }
1734
- player.sendMessage(TranslatableCaption.of("working.claimed"), Template.of("plot", this.getId().toString()));
1720
+ player.sendMessage(
1721
+ TranslatableCaption.of("working.claimed"),
1722
+ TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
1723
+ );
1735
1724
  if (teleport) {
1736
1725
  if (!auto && Settings.Teleport.ON_CLAIM) {
1737
1726
  teleportPlayer(player, TeleportCause.COMMAND_CLAIM, result -> {
@@ -2428,7 +2417,6 @@ public class Plot {
2428
2417
  if (!this.isMerged()) {
2429
2418
  Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
2430
2419
  Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
2431
- this.connectedCache = Sets.newHashSet(this);
2432
2420
  CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
2433
2421
  return Collections.singleton(rg);
2434
2422
  }
@@ -2594,11 +2582,13 @@ public class Plot {
2594
2582
  return;
2595
2583
  }
2596
2584
  Caption caption = TranslatableCaption.of("debug.plot_debug");
2597
- Template plotTemplate = Template.of("plot", this.toString());
2598
- Template messageTemplate = Template.of("message", message);
2585
+ TagResolver resolver = TagResolver.builder()
2586
+ .tag("plot", Tag.inserting(Component.text(toString())))
2587
+ .tag("message", Tag.inserting(Component.text(message)))
2588
+ .build();
2599
2589
  for (final PlotPlayer<?> player : players) {
2600
2590
  if (isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_DEBUG_OTHER)) {
2601
- player.sendMessage(caption, plotTemplate, messageTemplate);
2591
+ player.sendMessage(caption, resolver);
2602
2592
  }
2603
2593
  }
2604
2594
  } catch (final Exception ignored) {
@@ -2628,7 +2618,7 @@ public class Plot {
2628
2618
  if (result == Result.DENY) {
2629
2619
  player.sendMessage(
2630
2620
  TranslatableCaption.of("events.event_denied"),
2631
- Template.of("value", "Teleport")
2621
+ TagResolver.resolver("value", Tag.inserting(Component.text("Teleport")))
2632
2622
  );
2633
2623
  resultConsumer.accept(false);
2634
2624
  return;
@@ -2642,7 +2632,7 @@ public class Plot {
2642
2632
  }
2643
2633
  player.sendMessage(
2644
2634
  TranslatableCaption.of("teleport.teleport_in_seconds"),
2645
- Template.of("amount", String.valueOf(Settings.Teleport.DELAY))
2635
+ TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Teleport.DELAY)))
2646
2636
  );
2647
2637
  final String name = player.getName();
2648
2638
  TaskManager.addToTeleportQueue(name);
@@ -2818,41 +2808,45 @@ public class Plot {
2818
2808
  public CompletableFuture<Caption> format(final Caption iInfo, PlotPlayer<?> player, final boolean full) {
2819
2809
  final CompletableFuture<Caption> future = new CompletableFuture<>();
2820
2810
  int num = this.getConnectedPlots().size();
2821
- String alias = !this.getAlias().isEmpty() ? this.getAlias() : TranslatableCaption.of("info.none").getComponent(player);
2811
+ ComponentLike alias = !this.getAlias().isEmpty() ?
2812
+ Component.text(this.getAlias()) :
2813
+ TranslatableCaption.of("info.none").toComponent(player);
2822
2814
  Location bot = this.getCorners()[0];
2823
2815
  PlotSquared.platform().worldUtil().getBiome(
2824
2816
  Objects.requireNonNull(this.getWorldName()),
2825
2817
  bot.getX(),
2826
2818
  bot.getZ(),
2827
2819
  biome -> {
2828
- Component trusted = PlayerManager.getPlayerList(this.getTrusted(), player);
2829
- Component members = PlayerManager.getPlayerList(this.getMembers(), player);
2830
- Component denied = PlayerManager.getPlayerList(this.getDenied(), player);
2831
- String seen;
2832
- if (Settings.Enabled_Components.PLOT_EXPIRY && PlotSquared.platform().expireManager() != null) {
2820
+ ComponentLike trusted = PlayerManager.getPlayerList(this.getTrusted(), player);
2821
+ ComponentLike members = PlayerManager.getPlayerList(this.getMembers(), player);
2822
+ ComponentLike denied = PlayerManager.getPlayerList(this.getDenied(), player);
2823
+ ComponentLike seen;
2824
+ ExpireManager expireManager = PlotSquared.platform().expireManager();
2825
+ if (Settings.Enabled_Components.PLOT_EXPIRY && expireManager != null) {
2833
2826
  if (this.isOnline()) {
2834
- seen = TranslatableCaption.of("info.now").getComponent(player);
2827
+ seen = TranslatableCaption.of("info.now").toComponent(player);
2835
2828
  } else {
2836
2829
  int time = (int) (PlotSquared.platform().expireManager().getAge(this, false) / 1000);
2837
2830
  if (time != 0) {
2838
- seen = TimeUtil.secToTime(time);
2831
+ seen = Component.text(TimeUtil.secToTime(time));
2839
2832
  } else {
2840
- seen = TranslatableCaption.of("info.unknown").getComponent(player);
2833
+ seen = TranslatableCaption.of("info.unknown").toComponent(player);
2841
2834
  }
2842
2835
  }
2843
2836
  } else {
2844
- seen = TranslatableCaption.of("info.never").getComponent(player);
2837
+ seen = TranslatableCaption.of("info.never").toComponent(player);
2845
2838
  }
2846
2839
 
2847
- String description = this.getFlag(DescriptionFlag.class);
2848
- if (description.isEmpty()) {
2849
- description = TranslatableCaption.of("info.plot_no_description").getComponent(player);
2840
+ ComponentLike description = TranslatableCaption.of("info.plot_no_description").toComponent(player);
2841
+ String descriptionValue = this.getFlag(DescriptionFlag.class);
2842
+ if (!descriptionValue.isEmpty()) {
2843
+ description = Component.text(descriptionValue);
2850
2844
  }
2851
2845
 
2852
- Component flags;
2846
+ ComponentLike flags;
2853
2847
  Collection<PlotFlag<?, ?>> flagCollection = this.getApplicableFlags(true);
2854
2848
  if (flagCollection.isEmpty()) {
2855
- flags = MINI_MESSAGE.parse(TranslatableCaption.of("info.none").getComponent(player));
2849
+ flags = TranslatableCaption.of("info.none").toComponent(player);
2856
2850
  } else {
2857
2851
  TextComponent.Builder flagBuilder = Component.text();
2858
2852
  String prefix = "";
@@ -2863,13 +2857,18 @@ public class Plot {
2863
2857
  } else {
2864
2858
  value = flag.toString();
2865
2859
  }
2866
- Component snip = MINI_MESSAGE.parse(
2860
+ Component snip = MINI_MESSAGE.deserialize(
2867
2861
  prefix + CaptionUtility.format(
2868
2862
  player,
2869
2863
  TranslatableCaption.of("info.plot_flag_list").getComponent(player)
2870
2864
  ),
2871
- Template.of("flag", flag.getName()),
2872
- Template.of("value", CaptionUtility.formatRaw(player, value.toString()))
2865
+ TagResolver.builder()
2866
+ .tag("flag", Tag.inserting(Component.text(flag.getName())))
2867
+ .tag("value", Tag.inserting(Component.text(CaptionUtility.formatRaw(
2868
+ player,
2869
+ value.toString()
2870
+ ))))
2871
+ .build()
2873
2872
  );
2874
2873
  flagBuilder.append(snip);
2875
2874
  prefix = ", ";
@@ -2881,67 +2880,57 @@ public class Plot {
2881
2880
  if (this.getOwner() == null) {
2882
2881
  owner = Component.text("unowned");
2883
2882
  } else if (this.getOwner().equals(DBFunc.SERVER)) {
2884
- owner = Component.text(MINI_MESSAGE.stripTokens(TranslatableCaption
2883
+ owner = Component.text(MINI_MESSAGE.stripTags(TranslatableCaption
2885
2884
  .of("info.server")
2886
2885
  .getComponent(player)));
2887
2886
  } else {
2888
2887
  owner = PlayerManager.getPlayerList(this.getOwners(), player);
2889
2888
  }
2890
- Template headerTemplate = Template.of(
2891
- "header",
2892
- TranslatableCaption.of("info.plot_info_header").getComponent(player)
2893
- );
2894
- Template footerTemplate = Template.of(
2895
- "footer",
2896
- TranslatableCaption.of("info.plot_info_footer").getComponent(player)
2897
- );
2898
- Template areaTemplate;
2889
+ TagResolver.Builder tagBuilder = TagResolver.builder();
2890
+ tagBuilder.tag("header", Tag.inserting(TranslatableCaption.of("info.plot_info_header").toComponent(player)));
2891
+ tagBuilder.tag("footer", Tag.inserting(TranslatableCaption.of("info.plot_info_footer").toComponent(player)));
2892
+ TextComponent.Builder areaComponent = Component.text();
2899
2893
  if (this.getArea() != null) {
2900
- areaTemplate =
2901
- Template.of(
2902
- "area",
2903
- this.getArea().getWorldName() + (this.getArea().getId() == null
2904
- ? ""
2905
- : "(" + this.getArea().getId() + ")")
2906
- );
2894
+ areaComponent.append(Component.text(getArea().getWorldName()));
2895
+ if (getArea().getId() != null) {
2896
+ areaComponent.append(Component.text("("))
2897
+ .append(Component.text(getArea().getId()))
2898
+ .append(Component.text(")"));
2899
+ }
2907
2900
  } else {
2908
- areaTemplate = Template.of("area", TranslatableCaption.of("info.none").getComponent(player));
2901
+ areaComponent.append(TranslatableCaption.of("info.none").toComponent(player));
2909
2902
  }
2903
+ tagBuilder.tag("area", Tag.inserting(areaComponent));
2910
2904
  long creationDate = Long.parseLong(String.valueOf(timestamp));
2911
2905
  SimpleDateFormat sdf = new SimpleDateFormat(Settings.Timeformat.DATE_FORMAT);
2912
2906
  sdf.setTimeZone(TimeZone.getTimeZone(Settings.Timeformat.TIME_ZONE));
2913
2907
  String newDate = sdf.format(creationDate);
2914
2908
 
2915
- Template idTemplate = Template.of("id", this.getId().toString());
2916
- Template aliasTemplate = Template.of("alias", alias);
2917
- Template numTemplate = Template.of("num", String.valueOf(num));
2918
- Template descTemplate = Template.of("desc", description);
2919
- Template biomeTemplate = Template.of("biome", biome.toString().toLowerCase());
2920
- Template ownerTemplate = Template.of("owner", owner);
2921
- Template membersTemplate = Template.of("members", members);
2922
- Template playerTemplate = Template.of("player", player.getName());
2923
- Template trustedTemplate = Template.of("trusted", trusted);
2924
- Template helpersTemplate = Template.of("helpers", members);
2925
- Template deniedTemplate = Template.of("denied", denied);
2926
- Template seenTemplate = Template.of("seen", seen);
2927
- Template flagsTemplate = Template.of("flags", flags);
2928
- Template creationTemplate = Template.of("creationdate", newDate);
2929
- Template buildTemplate = Template.of("build", String.valueOf(build));
2930
- Template sizeTemplate = Template.of("size", String.valueOf(getConnectedPlots().size()));
2909
+ tagBuilder.tag("id", Tag.inserting(Component.text(getId().toString())));
2910
+ tagBuilder.tag("alias", Tag.inserting(alias));
2911
+ tagBuilder.tag("num", Tag.inserting(Component.text(num)));
2912
+ tagBuilder.tag("desc", Tag.inserting(description));
2913
+ tagBuilder.tag("biome", Tag.inserting(Component.text(biome.toString().toLowerCase())));
2914
+ tagBuilder.tag("owner", Tag.inserting(owner));
2915
+ tagBuilder.tag("members", Tag.inserting(members));
2916
+ tagBuilder.tag("player", Tag.inserting(Component.text(player.getName())));
2917
+ tagBuilder.tag("trusted", Tag.inserting(trusted));
2918
+ tagBuilder.tag("denied", Tag.inserting(denied));
2919
+ tagBuilder.tag("seen", Tag.inserting(seen));
2920
+ tagBuilder.tag("flags", Tag.inserting(flags));
2921
+ tagBuilder.tag("creationdate", Tag.inserting(Component.text(newDate)));
2922
+ tagBuilder.tag("build", Tag.inserting(Component.text(build)));
2923
+ tagBuilder.tag("size", Tag.inserting(Component.text(getConnectedPlots().size())));
2931
2924
  String component = iInfo.getComponent(player);
2932
2925
  if (component.contains("<rating>") || component.contains("<likes>")) {
2933
2926
  TaskManager.runTaskAsync(() -> {
2934
- Template ratingTemplate;
2935
- Template likesTemplate;
2936
2927
  if (Settings.Ratings.USE_LIKES) {
2937
- ratingTemplate = Template.of(
2938
- "rating",
2928
+ tagBuilder.tag("rating", Tag.inserting(Component.text(
2939
2929
  String.format("%.0f%%", Like.getLikesPercentage(this) * 100D)
2940
- );
2941
- likesTemplate = Template.of(
2942
- "likes",
2930
+ )));
2931
+ tagBuilder.tag("likes", Tag.inserting(Component.text(
2943
2932
  String.format("%.0f%%", Like.getLikesPercentage(this) * 100D)
2944
- );
2933
+ )));
2945
2934
  } else {
2946
2935
  int max = 10;
2947
2936
  if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
@@ -2956,70 +2945,34 @@ public class Plot {
2956
2945
  .append(String.format("%.1f", ratings[i]));
2957
2946
  prefix = ",";
2958
2947
  }
2959
- ratingTemplate = Template.of("rating", rating.toString());
2948
+ tagBuilder.tag("rating", Tag.inserting(Component.text(rating.toString())));
2960
2949
  } else {
2961
2950
  double rating = this.getAverageRating();
2962
2951
  if (Double.isFinite(rating)) {
2963
- ratingTemplate = Template.of("rating", String.format("%.1f", rating) + '/' + max);
2964
- } else {
2965
- ratingTemplate = Template.of(
2952
+ tagBuilder.tag(
2966
2953
  "rating",
2967
- TranslatableCaption.of("info.none").getComponent(player)
2954
+ Tag.inserting(Component.text(String.format("%.1f", rating) + '/' + max))
2955
+ );
2956
+ } else {
2957
+ tagBuilder.tag(
2958
+ "rating", Tag.inserting(TranslatableCaption.of("info.none").toComponent(player))
2968
2959
  );
2969
2960
  }
2970
2961
  }
2971
- likesTemplate = Template.of("likes", "N/A");
2962
+ tagBuilder.tag("likes", Tag.inserting(Component.text("N/A")));
2972
2963
  }
2973
2964
  future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
2974
- .parse(
2965
+ .deserialize(
2975
2966
  iInfo.getComponent(player),
2976
- headerTemplate,
2977
- areaTemplate,
2978
- idTemplate,
2979
- aliasTemplate,
2980
- numTemplate,
2981
- descTemplate,
2982
- biomeTemplate,
2983
- ownerTemplate,
2984
- membersTemplate,
2985
- playerTemplate,
2986
- trustedTemplate,
2987
- helpersTemplate,
2988
- deniedTemplate,
2989
- seenTemplate,
2990
- flagsTemplate,
2991
- buildTemplate,
2992
- ratingTemplate,
2993
- creationTemplate,
2994
- sizeTemplate,
2995
- likesTemplate,
2996
- footerTemplate
2967
+ tagBuilder.build()
2997
2968
  ))));
2998
2969
  });
2999
2970
  return;
3000
2971
  }
3001
2972
  future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
3002
- .parse(
2973
+ .deserialize(
3003
2974
  iInfo.getComponent(player),
3004
- headerTemplate,
3005
- areaTemplate,
3006
- idTemplate,
3007
- aliasTemplate,
3008
- numTemplate,
3009
- descTemplate,
3010
- biomeTemplate,
3011
- ownerTemplate,
3012
- membersTemplate,
3013
- playerTemplate,
3014
- trustedTemplate,
3015
- helpersTemplate,
3016
- deniedTemplate,
3017
- seenTemplate,
3018
- flagsTemplate,
3019
- buildTemplate,
3020
- creationTemplate,
3021
- sizeTemplate,
3022
- footerTemplate
2975
+ tagBuilder.build()
3023
2976
  ))));
3024
2977
  }
3025
2978
  );
Core/src/main/java/com/plotsquared/core/plot/PlotArea.java CHANGED
@@ -35,7 +35,6 @@ import com.plotsquared.core.inject.annotations.WorldConfig;
35
35
  import com.plotsquared.core.location.BlockLoc;
36
36
  import com.plotsquared.core.location.Direction;
37
37
  import com.plotsquared.core.location.Location;
38
- import com.plotsquared.core.location.PlotLoc;
39
38
  import com.plotsquared.core.permissions.Permission;
40
39
  import com.plotsquared.core.player.ConsolePlayer;
41
40
  import com.plotsquared.core.player.MetaDataAccess;
@@ -59,12 +58,16 @@ import com.sk89q.worldedit.world.biome.BiomeType;
59
58
  import com.sk89q.worldedit.world.biome.BiomeTypes;
60
59
  import com.sk89q.worldedit.world.gamemode.GameMode;
61
60
  import com.sk89q.worldedit.world.gamemode.GameModes;
61
+ import net.kyori.adventure.text.Component;
62
+ import net.kyori.adventure.text.ComponentLike;
62
63
  import net.kyori.adventure.text.minimessage.MiniMessage;
63
- import net.kyori.adventure.text.minimessage.Template;
64
+ import net.kyori.adventure.text.minimessage.tag.Tag;
65
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
64
66
  import org.apache.logging.log4j.LogManager;
65
67
  import org.apache.logging.log4j.Logger;
66
68
  import org.checkerframework.checker.nullness.qual.NonNull;
67
69
  import org.checkerframework.checker.nullness.qual.Nullable;
70
+ import org.jetbrains.annotations.NotNull;
68
71
 
69
72
  import java.text.DecimalFormat;
70
73
  import java.util.ArrayList;
@@ -84,7 +87,7 @@ import java.util.function.Consumer;
84
87
  /**
85
88
  * @author Jesse Boyd, Alexander Söderberg
86
89
  */
87
- public abstract class PlotArea {
90
+ public abstract class PlotArea implements ComponentLike {
88
91
 
89
92
  private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotArea.class.getSimpleName());
90
93
  private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
@@ -405,7 +408,7 @@ public abstract class PlotArea {
405
408
  this.getFlagContainer().addAll(parseFlags(flags));
406
409
  ConsolePlayer.getConsole().sendMessage(
407
410
  TranslatableCaption.of("flags.area_flags"),
408
- Template.of("flags", flags.toString())
411
+ TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
409
412
  );
410
413
 
411
414
  this.spawnEggs = config.getBoolean("event.spawn.egg");
@@ -427,7 +430,7 @@ public abstract class PlotArea {
427
430
  this.getRoadFlagContainer().addAll(parseFlags(roadflags));
428
431
  ConsolePlayer.getConsole().sendMessage(
429
432
  TranslatableCaption.of("flags.road_flags"),
430
- Template.of("flags", roadflags.toString())
433
+ TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
431
434
  );
432
435
 
433
436
  loadConfiguration(config);
@@ -520,6 +523,11 @@ public abstract class PlotArea {
520
523
  }
521
524
  }
522
525
 
526
+ @Override
527
+ public @NotNull Component asComponent() {
528
+ return Component.text(toString());
529
+ }
530
+
523
531
  @Override
524
532
  public int hashCode() {
525
533
  if (this.hash != 0) {
@@ -648,8 +656,12 @@ public abstract class PlotArea {
648
656
  if (!buildRangeContainsY(y) && !player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
649
657
  player.sendMessage(
650
658
  TranslatableCaption.of("height.height_limit"),
651
- Template.of("minHeight", String.valueOf(minBuildHeight)),
652
- Template.of("maxHeight", String.valueOf(maxBuildHeight))
659
+ TagResolver.builder()
660
+ .tag("minHeight", Tag.inserting(Component.text(minBuildHeight)))
661
+ .tag(
662
+ "maxHeight",
663
+ Tag.inserting(Component.text(maxBuildHeight))
664
+ ).build()
653
665
  );
654
666
  // Return true if "failed" as the method will always be inverted otherwise
655
667
  return true;
@@ -1007,7 +1019,7 @@ public abstract class PlotArea {
1007
1019
  *
1008
1020
  * @param plotIds List of plot IDs to merge
1009
1021
  * @param removeRoads If the roads between plots should be removed
1010
- * @param whenDone Task to run when any merge world changes are complete. Also runs if no changes were made. Does not
1022
+ * @param whenDone Task to run when any merge world changes are complete. Also runs if no changes were made. Does not
1011
1023
  * run if there was an error or if too few plots IDs were supplied.
1012
1024
  * @return if merges were completed successfully.
1013
1025
  * @since 6.9.0
@@ -1324,20 +1336,6 @@ public abstract class PlotArea {
1324
1336
  return this.signMaterial;
1325
1337
  }
1326
1338
 
1327
- /**
1328
- * Get the legacy plot sign material before wall signs used a "wall" stance.
1329
- *
1330
- * @return the legacy sign material.
1331
- * @deprecated Use {@link #signMaterial()}. This method is used for 1.13 only and
1332
- * will be removed without replacement in favor of {@link #signMaterial()}
1333
- * once we remove the support for 1.13.
1334
- * @since 6.0.3
1335
- */
1336
- @Deprecated(forRemoval = true, since = "6.0.3")
1337
- public String getLegacySignMaterial() {
1338
- return this.legacySignMaterial;
1339
- }
1340
-
1341
1339
  public boolean isSpawnCustom() {
1342
1340
  return this.spawnCustom;
1343
1341
  }
@@ -1396,22 +1394,6 @@ public abstract class PlotArea {
1396
1394
  return this.defaultHome;
1397
1395
  }
1398
1396
 
1399
- /**
1400
- * @deprecated Use {@link #nonmemberHome}
1401
- */
1402
- @Deprecated(forRemoval = true, since = "6.1.4")
1403
- public PlotLoc getNonmemberHome() {
1404
- return new PlotLoc(this.defaultHome.getX(), this.defaultHome.getY(), this.defaultHome.getZ());
1405
- }
1406
-
1407
- /**
1408
- * @deprecated Use {@link #defaultHome}
1409
- */
1410
- @Deprecated(forRemoval = true, since = "6.1.4")
1411
- public PlotLoc getDefaultHome() {
1412
- return new PlotLoc(this.defaultHome.getX(), this.defaultHome.getY(), this.defaultHome.getZ());
1413
- }
1414
-
1415
1397
  protected void setDefaultHome(BlockLoc defaultHome) {
1416
1398
  this.defaultHome = defaultHome;
1417
1399
  }
Core/src/main/java/com/plotsquared/core/plot/PlotId.java CHANGED
@@ -106,17 +106,6 @@ public final class PlotId {
106
106
  return PlotId.of(hash >> 16, hash & 0xFFFF);
107
107
  }
108
108
 
109
- /**
110
- * Get a copy of the plot ID
111
- *
112
- * @return Plot ID copy
113
- * @deprecated PlotId is immutable, copy is not required.
114
- */
115
- @Deprecated(forRemoval = true, since = "6.10.2")
116
- public @NonNull PlotId copy() {
117
- return this;
118
- }
119
-
120
109
  /**
121
110
  * Get the ID X component
122
111
  *
Core/src/main/java/com/plotsquared/core/plot/PlotInventory.java CHANGED
@@ -100,7 +100,7 @@ public class PlotInventory {
100
100
  * Put an item into this inventory
101
101
  *
102
102
  * @param index the index (= slot) where to place the item
103
- * @param item the item to place
103
+ * @param item the item to place
104
104
  * @see #setItemChecked(int, PlotItemStack)
105
105
  */
106
106
  public void setItem(int index, PlotItemStack item) {
Core/src/main/java/com/plotsquared/core/plot/PlotManager.java CHANGED
@@ -203,15 +203,6 @@ public abstract class PlotManager {
203
203
  Template.zipAll(plotArea.getWorldName(), files);
204
204
  }
205
205
 
206
- /**
207
- * @return the world height
208
- * @deprecated In favor of custom world heights within 1.17 and therefore scheduled for removal without replacement
209
- */
210
- @Deprecated(forRemoval = true, since = "6.0.0")
211
- public int getWorldHeight() {
212
- return 255;
213
- }
214
-
215
206
  /**
216
207
  * Sets all the blocks along all the plot walls to their correct state (claimed or unclaimed).
217
208
  *
Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java CHANGED
@@ -46,7 +46,9 @@ import com.sk89q.worldedit.math.BlockVector2;
46
46
  import com.sk89q.worldedit.regions.CuboidRegion;
47
47
  import com.sk89q.worldedit.world.biome.BiomeType;
48
48
  import com.sk89q.worldedit.world.block.BlockTypes;
49
- import net.kyori.adventure.text.minimessage.Template;
49
+ import net.kyori.adventure.text.Component;
50
+ import net.kyori.adventure.text.minimessage.tag.Tag;
51
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
50
52
  import org.apache.logging.log4j.LogManager;
51
53
  import org.apache.logging.log4j.Logger;
52
54
  import org.checkerframework.checker.nullness.qual.NonNull;
@@ -415,7 +417,10 @@ public final class PlotModificationManager {
415
417
  Caption[] lines = new Caption[]{TranslatableCaption.of("signs.owner_sign_line_1"), TranslatableCaption.of(
416
418
  "signs.owner_sign_line_2"),
417
419
  TranslatableCaption.of("signs.owner_sign_line_3"), TranslatableCaption.of("signs.owner_sign_line_4")};
418
- PlotSquared.platform().worldUtil().setSign(location, lines, Template.of("id", id), Template.of("owner", name));
420
+ PlotSquared.platform().worldUtil().setSign(location, lines, TagResolver.builder()
421
+ .tag("id", Tag.inserting(Component.text(id)))
422
+ .tag("owner", Tag.inserting(Component.text(name)))
423
+ .build());
419
424
  }
420
425
  }
421
426
 
@@ -524,7 +529,7 @@ public final class PlotModificationManager {
524
529
  if (player != null) {
525
530
  player.sendMessage(
526
531
  TranslatableCaption.of("events.event_denied"),
527
- Template.of("value", "Auto merge on claim")
532
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge on claim")))
528
533
  );
529
534
  }
530
535
  return;
Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java CHANGED
@@ -79,18 +79,6 @@ public class PlotSettings {
79
79
  this.ratings = ratings;
80
80
  }
81
81
 
82
- /**
83
- * @deprecated Unused internally. Scheduled for removal in next major release. Use {@link PlotSettings#setMerged(Direction, boolean)}
84
- */
85
- @Deprecated(forRemoval = true, since = "6.11.1")
86
- public boolean setMerged(int direction, boolean merged) {
87
- if (this.merged[direction] != merged) {
88
- this.merged[direction] = merged;
89
- return true;
90
- }
91
- return false;
92
- }
93
-
94
82
  public boolean setMerged(Direction direction, boolean merged) {
95
83
  if (Direction.ALL == direction) {
96
84
  throw new IllegalArgumentException("You cannot use Direction.ALL in this method!");
@@ -117,13 +105,12 @@ public class PlotSettings {
117
105
  this.position = position;
118
106
  }
119
107
 
120
- @SuppressWarnings({"UnstableApiUsage"})
121
108
  public List<PlotComment> getComments(String inbox) {
122
109
  if (this.comments == null) {
123
110
  return Collections.emptyList();
124
111
  }
125
112
 
126
- return this.comments.stream().filter(comment -> comment.inbox.equals(inbox))
113
+ return this.comments.stream().filter(comment -> comment.inbox().equals(inbox))
127
114
  .collect(ImmutableList.toImmutableList());
128
115
  }
129
116
 
Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java CHANGED
@@ -114,12 +114,4 @@ public abstract class PlotWorld {
114
114
  return world.hashCode();
115
115
  }
116
116
 
117
- /**
118
- * @deprecated This method is not meant to be invoked or overridden, with no replacement.
119
- */
120
- @Deprecated(forRemoval = true, since = "6.6.0")
121
- protected boolean canEqual(final Object other) {
122
- return other instanceof PlotWorld;
123
- }
124
-
125
117
  }
Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java CHANGED
@@ -29,7 +29,9 @@ import com.plotsquared.core.plot.Plot;
29
29
  import com.plotsquared.core.util.task.RunnableVal;
30
30
  import com.plotsquared.core.util.task.TaskManager;
31
31
  import com.plotsquared.core.util.task.TaskTime;
32
- import net.kyori.adventure.text.minimessage.Template;
32
+ import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.minimessage.tag.Tag;
34
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
33
35
 
34
36
  import java.util.Collection;
35
37
  import java.util.HashMap;
@@ -56,7 +58,7 @@ public class CommentManager {
56
58
  if (value != null) {
57
59
  int num = 0;
58
60
  for (PlotComment comment : value) {
59
- if (comment.timestamp > getTimestamp(player, inbox.toString())) {
61
+ if (comment.timestamp() > getTimestamp(player, inbox.toString())) {
60
62
  num++;
61
63
  }
62
64
  }
@@ -68,8 +70,10 @@ public class CommentManager {
68
70
  player.sendTitle(
69
71
  StaticCaption.of(""),
70
72
  TranslatableCaption.of("comment.inbox_notification"),
71
- Template.of("amount", Integer.toString(total)),
72
- Template.of("command", "/plot inbox")
73
+ TagResolver.builder()
74
+ .tag("amount", Tag.inserting(Component.text(total)))
75
+ .tag("command", Tag.inserting(Component.text("/plot inbox")))
76
+ .build()
73
77
  );
74
78
  }
75
79
  }
Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java CHANGED
@@ -20,25 +20,13 @@ package com.plotsquared.core.plot.comment;
20
20
 
21
21
  import com.plotsquared.core.plot.PlotId;
22
22
 
23
- public class PlotComment {
24
-
25
- public final String comment;
26
- public final String inbox;
27
- public final String senderName;
28
- public final PlotId id;
29
- public final String world;
30
- public final long timestamp;
31
-
32
- public PlotComment(
33
- String world, PlotId id, String comment, String senderName, String inbox,
34
- long timestamp
35
- ) {
36
- this.world = world;
37
- this.id = id;
38
- this.comment = comment;
39
- this.senderName = senderName;
40
- this.inbox = inbox;
41
- this.timestamp = timestamp;
42
- }
23
+ public record PlotComment(
24
+ String world,
25
+ PlotId id,
26
+ String comment,
27
+ String senderName,
28
+ String inbox,
29
+ long timestamp
30
+ ) {
43
31
 
44
32
  }
Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java CHANGED
@@ -19,10 +19,8 @@
19
19
  package com.plotsquared.core.plot.expiration;
20
20
 
21
21
  import com.google.inject.Inject;
22
- import com.plotsquared.core.PlotPlatform;
23
22
  import com.plotsquared.core.PlotSquared;
24
23
  import com.plotsquared.core.configuration.caption.Caption;
25
- import com.plotsquared.core.configuration.caption.Templates;
26
24
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
27
25
  import com.plotsquared.core.database.DBFunc;
28
26
  import com.plotsquared.core.events.PlotFlagAddEvent;
@@ -46,7 +44,9 @@ import com.plotsquared.core.util.task.RunnableVal;
46
44
  import com.plotsquared.core.util.task.RunnableVal3;
47
45
  import com.plotsquared.core.util.task.TaskManager;
48
46
  import com.plotsquared.core.util.task.TaskTime;
49
- import net.kyori.adventure.text.minimessage.Template;
47
+ import net.kyori.adventure.text.Component;
48
+ import net.kyori.adventure.text.minimessage.tag.Tag;
49
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
50
50
  import org.checkerframework.checker.nullness.qual.NonNull;
51
51
 
52
52
  import java.util.ArrayDeque;
@@ -62,11 +62,6 @@ import java.util.concurrent.ConcurrentLinkedDeque;
62
62
 
63
63
  public class ExpireManager {
64
64
 
65
- /**
66
- * @deprecated Use {@link PlotPlatform#expireManager()} instead
67
- */
68
- @Deprecated(forRemoval = true, since = "6.10.2")
69
- public static ExpireManager IMP;
70
65
  private final ConcurrentHashMap<UUID, Long> dates_cache;
71
66
  private final ConcurrentHashMap<UUID, Long> account_age_cache;
72
67
  private final EventDispatcher eventDispatcher;
@@ -152,25 +147,17 @@ public class ExpireManager {
152
147
  current.getCenter(pp::teleport);
153
148
  metaDataAccess.remove();
154
149
  Caption msg = TranslatableCaption.of("expiry.expired_options_clicky");
155
- Template numTemplate = Template.of("num", String.valueOf(num));
156
- Template areIsTemplate = Template.of("are_or_is", (num > 1 ? "plots are" : "plot is"));
157
- Template list_cmd = Template.of("list_cmd", "/plot list expired");
158
- Template plot = Template.of("plot", current.toString());
159
- Template cmd_del = Template.of("cmd_del", "/plot delete");
160
- Template cmd_keep_1d = Template.of("cmd_keep_1d", "/plot flag set keep 1d");
161
- Template cmd_keep = Template.of("cmd_keep", "/plot flag set keep true");
162
- Template cmd_no_show_expir = Template.of("cmd_no_show_expir", "/plot toggle clear-confirmation");
163
- pp.sendMessage(
164
- msg,
165
- numTemplate,
166
- areIsTemplate,
167
- list_cmd,
168
- plot,
169
- cmd_del,
170
- cmd_keep_1d,
171
- cmd_keep,
172
- cmd_no_show_expir
173
- );
150
+ TagResolver resolver = TagResolver.builder()
151
+ .tag("num", Tag.inserting(Component.text(num)))
152
+ .tag("are_or_is", Tag.inserting(Component.text(num > 1 ? "plots are" : "plot is")))
153
+ .tag("list_cmd", Tag.preProcessParsed("/plot list expired"))
154
+ .tag("plot", Tag.inserting(Component.text(current.toString())))
155
+ .tag("cmd_del", Tag.preProcessParsed("/plot delete"))
156
+ .tag("cmd_keep_1d", Tag.preProcessParsed("/plot flag set keep 1d"))
157
+ .tag("cmd_keep", Tag.preProcessParsed("/plot flag set keep true"))
158
+ .tag("cmd_no_show_expir", Tag.preProcessParsed("/plot toggle clear-confirmation"))
159
+ .build();
160
+ pp.sendMessage(msg, resolver);
174
161
  return;
175
162
  } else {
176
163
  iter.remove();
@@ -436,7 +423,7 @@ public class ExpireManager {
436
423
  if (player != null) {
437
424
  player.sendMessage(
438
425
  TranslatableCaption.of("trusted.plot_removed_user"),
439
- Templates.of("plot", plot.toString())
426
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
440
427
  );
441
428
  }
442
429
  }
@@ -445,18 +432,13 @@ public class ExpireManager {
445
432
  if (player != null) {
446
433
  player.sendMessage(
447
434
  TranslatableCaption.of("trusted.plot_removed_user"),
448
- Templates.of("plot", plot.toString())
435
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
449
436
  );
450
437
  }
451
438
  }
452
439
  plot.getPlotModificationManager().deletePlot(null, whenDone);
453
440
  }
454
441
 
455
- @Deprecated(forRemoval = true, since = "6.4.0")
456
- public long getAge(UUID uuid) {
457
- return getAge(uuid, false);
458
- }
459
-
460
442
  /**
461
443
  * Get the age (last play time) of the passed player
462
444
  *
Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java CHANGED
@@ -154,6 +154,7 @@ public class ExpiryTask {
154
154
 
155
155
  /**
156
156
  * Returns {@code true} if this task respects unknown owners
157
+ *
157
158
  * @return {@code true} if unknown owners should be counted as never online
158
159
  * @since 6.4.0
159
160
  */
Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java CHANGED
@@ -380,14 +380,6 @@ public class FlagContainer {
380
380
  return flagMap.hashCode();
381
381
  }
382
382
 
383
- /**
384
- * @deprecated This method is not meant to be invoked or overridden, with no replacement.
385
- */
386
- @Deprecated(forRemoval = true, since = "6.6.0")
387
- protected boolean canEqual(final Object other) {
388
- return other instanceof FlagContainer;
389
- }
390
-
391
383
  /**
392
384
  * Update event types used in {@link PlotFlagUpdateHandler}.
393
385
  */
Core/src/main/java/com/plotsquared/core/plot/flag/FlagParseException.java CHANGED
@@ -19,14 +19,14 @@
19
19
  package com.plotsquared.core.plot.flag;
20
20
 
21
21
  import com.plotsquared.core.configuration.caption.Caption;
22
- import net.kyori.adventure.text.minimessage.Template;
22
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
23
23
 
24
24
  public class FlagParseException extends Exception {
25
25
 
26
26
  private final PlotFlag<?, ?> flag;
27
27
  private final String value;
28
28
  private final Caption errorMessage;
29
- private final Template[] templates;
29
+ private final TagResolver[] tagResolvers;
30
30
 
31
31
  /**
32
32
  * Construct a new flag parse exception to indicate that an attempt to parse a plot
@@ -39,7 +39,7 @@ public class FlagParseException extends Exception {
39
39
  */
40
40
  public FlagParseException(
41
41
  final PlotFlag<?, ?> flag, final String value,
42
- final Caption errorMessage, final Template... args
42
+ final Caption errorMessage, final TagResolver... args
43
43
  ) {
44
44
  super(String.format("Failed to parse flag of type '%s'. Value '%s' was not accepted.",
45
45
  flag.getName(), value
@@ -47,7 +47,7 @@ public class FlagParseException extends Exception {
47
47
  this.flag = flag;
48
48
  this.value = value;
49
49
  this.errorMessage = errorMessage;
50
- this.templates = args;
50
+ this.tagResolvers = args;
51
51
  }
52
52
 
53
53
  /**
@@ -82,8 +82,8 @@ public class FlagParseException extends Exception {
82
82
  *
83
83
  * @return Message templates.
84
84
  */
85
- public Template[] getTemplates() {
86
- return templates;
85
+ public TagResolver[] getTagResolvers() {
86
+ return tagResolvers;
87
87
  }
88
88
 
89
89
  }
Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java CHANGED
@@ -20,6 +20,7 @@ package com.plotsquared.core.plot.flag;
20
20
 
21
21
  import com.google.common.base.Preconditions;
22
22
  import com.plotsquared.core.configuration.caption.Caption;
23
+ import net.kyori.adventure.text.Component;
23
24
  import org.checkerframework.checker.nullness.qual.NonNull;
24
25
 
25
26
  import java.util.Collection;
@@ -83,6 +84,16 @@ public abstract class PlotFlag<T, F extends PlotFlag<T, F>> {
83
84
  return flagName.toString();
84
85
  }
85
86
 
87
+ /**
88
+ * Gets the flag name as a Kyori {@link Component}
89
+ *
90
+ * @see #getFlagName(Class)
91
+ * @since 7.0.0
92
+ */
93
+ public static <T, F extends PlotFlag<T, F>> Component getFlagNameComponent(Class<F> flagClass) {
94
+ return Component.text(getFlagName(flagClass));
95
+ }
96
+
86
97
  /**
87
98
  * Get the flag value
88
99
  *
@@ -210,13 +221,4 @@ public abstract class PlotFlag<T, F extends PlotFlag<T, F>> {
210
221
  return value.hashCode();
211
222
  }
212
223
 
213
- /**
214
- * @deprecated This method is not meant to be invoked or overridden, with no replacement.
215
- */
216
- @Deprecated(forRemoval = true, since = "6.6.0")
217
- protected boolean canEqual(final Object other) {
218
- return other instanceof PlotFlag;
219
- }
220
-
221
-
222
224
  }
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java CHANGED
@@ -27,7 +27,7 @@ public class BeaconEffectsFlag extends BooleanFlag<BeaconEffectsFlag> {
27
27
  public static final BeaconEffectsFlag BEACON_EFFECT_TRUE = new BeaconEffectsFlag(true);
28
28
  public static final BeaconEffectsFlag BEACON_EFFECT_FALSE = new BeaconEffectsFlag(false);
29
29
 
30
- private BeaconEffectsFlag(boolean value){
30
+ private BeaconEffectsFlag(boolean value) {
31
31
  super(value, TranslatableCaption.of("flags.flag_description_beacon_effect"));
32
32
  }
33
33
 
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java CHANGED
@@ -23,7 +23,9 @@ import com.plotsquared.core.player.PlotPlayer;
23
23
  import com.plotsquared.core.plot.Plot;
24
24
  import com.plotsquared.core.plot.flag.FlagParseException;
25
25
  import com.plotsquared.core.plot.flag.PlotFlag;
26
- import net.kyori.adventure.text.minimessage.Template;
26
+ import net.kyori.adventure.text.Component;
27
+ import net.kyori.adventure.text.minimessage.tag.Tag;
28
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
27
29
  import org.checkerframework.checker.nullness.qual.NonNull;
28
30
  import org.checkerframework.checker.nullness.qual.Nullable;
29
31
 
@@ -55,24 +57,15 @@ public class DenyTeleportFlag extends PlotFlag<DenyTeleportFlag.DeniedGroup, Den
55
57
  }
56
58
  final boolean result;
57
59
  switch (value) {
58
- case TRUSTED:
59
- result = !plot.getTrusted().contains(player.getUUID());
60
- break;
61
- case MEMBERS:
62
- result = !plot.getMembers().contains(player.getUUID());
63
- break;
64
- case NONMEMBERS:
65
- result = plot.isAdded(player.getUUID());
66
- break;
67
- case NONTRUSTED:
68
- result =
69
- plot.getTrusted().contains(player.getUUID()) || plot.isOwner(player.getUUID());
70
- break;
71
- case NONOWNERS:
72
- result = plot.isOwner(player.getUUID());
73
- break;
74
- default:
60
+ case TRUSTED -> result = !plot.getTrusted().contains(player.getUUID());
61
+ case MEMBERS -> result = !plot.getMembers().contains(player.getUUID());
62
+ case NONMEMBERS -> result = plot.isAdded(player.getUUID());
63
+ case NONTRUSTED -> result =
64
+ plot.getTrusted().contains(player.getUUID()) || plot.isOwner(player.getUUID());
65
+ case NONOWNERS -> result = plot.isOwner(player.getUUID());
66
+ default -> {
75
67
  return true;
68
+ }
76
69
  }
77
70
  return result || player.hasPermission("plots.admin.entry.denied");
78
71
  }
@@ -82,7 +75,10 @@ public class DenyTeleportFlag extends PlotFlag<DenyTeleportFlag.DeniedGroup, Den
82
75
  final DeniedGroup group = DeniedGroup.fromString(input);
83
76
  if (group == null) {
84
77
  throw new FlagParseException(this, input, TranslatableCaption.of("flags.flag_error_enum"),
85
- Template.of("list", "members, nonmembers, trusted, nontrusted, nonowners")
78
+ TagResolver.resolver(
79
+ "list",
80
+ Tag.inserting(Component.text("members, nonmembers, trusted, nontrusted, nonowners"))
81
+ )
86
82
  );
87
83
  }
88
84
  return flagOf(group);
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DescriptionFlag.java CHANGED
@@ -51,7 +51,7 @@ public class DescriptionFlag extends StringFlag<DescriptionFlag> {
51
51
 
52
52
  @Override
53
53
  public String getExample() {
54
- return "&6This is my plot!";
54
+ return "<gold>This is my plot!";
55
55
  }
56
56
 
57
57
  @Override
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java CHANGED
@@ -21,7 +21,9 @@ package com.plotsquared.core.plot.flag.implementations;
21
21
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
22
22
  import com.plotsquared.core.plot.flag.FlagParseException;
23
23
  import com.plotsquared.core.plot.flag.types.TimedFlag;
24
- import net.kyori.adventure.text.minimessage.Template;
24
+ import net.kyori.adventure.text.Component;
25
+ import net.kyori.adventure.text.minimessage.tag.Tag;
26
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
25
27
  import org.checkerframework.checker.nullness.qual.NonNull;
26
28
 
27
29
  public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
@@ -42,7 +44,7 @@ public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
42
44
  this,
43
45
  input,
44
46
  TranslatableCaption.of("invalid.not_a_number"),
45
- Template.of("value", input)
47
+ TagResolver.resolver("value", Tag.inserting(Component.text(input)))
46
48
  );
47
49
  }
48
50
  if (parsed < 1) {
@@ -50,7 +52,7 @@ public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
50
52
  this,
51
53
  input,
52
54
  TranslatableCaption.of("invalid.number_not_positive"),
53
- Template.of("value", String.valueOf(parsed))
55
+ TagResolver.resolver("value", Tag.inserting(Component.text(parsed)))
54
56
  );
55
57
  }
56
58
  return parsed;
@@ -58,7 +60,7 @@ public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
58
60
 
59
61
  @Override
60
62
  protected Integer mergeValue(Integer other) {
61
- return this.getValue().getValue() + other;
63
+ return this.getValue().value() + other;
62
64
  }
63
65
 
64
66
  @Override
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java CHANGED
@@ -68,14 +68,11 @@ public class FlyFlag extends PlotFlag<FlyFlag.FlyStatus, FlyFlag> {
68
68
 
69
69
  @Override
70
70
  protected FlyFlag flagOf(final @NonNull FlyStatus value) {
71
- switch (value) {
72
- case ENABLED:
73
- return FLIGHT_FLAG_ENABLED;
74
- case DISABLED:
75
- return FLIGHT_FLAG_DISABLED;
76
- default:
77
- return FLIGHT_FLAG_DEFAULT;
78
- }
71
+ return switch (value) {
72
+ case ENABLED -> FLIGHT_FLAG_ENABLED;
73
+ case DISABLED -> FLIGHT_FLAG_DISABLED;
74
+ default -> FLIGHT_FLAG_DEFAULT;
75
+ };
79
76
  }
80
77
 
81
78
  @Override
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GreetingFlag.java CHANGED
@@ -51,7 +51,7 @@ public class GreetingFlag extends StringFlag<GreetingFlag> {
51
51
 
52
52
  @Override
53
53
  public String getExample() {
54
- return "&6Welcome to my plot!";
54
+ return "<gold>Welcome to my plot!";
55
55
  }
56
56
 
57
57
  @Override
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java CHANGED
@@ -21,7 +21,9 @@ package com.plotsquared.core.plot.flag.implementations;
21
21
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
22
22
  import com.plotsquared.core.plot.flag.FlagParseException;
23
23
  import com.plotsquared.core.plot.flag.types.TimedFlag;
24
- import net.kyori.adventure.text.minimessage.Template;
24
+ import net.kyori.adventure.text.Component;
25
+ import net.kyori.adventure.text.minimessage.tag.Tag;
26
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
25
27
  import org.checkerframework.checker.nullness.qual.NonNull;
26
28
 
27
29
  public class HealFlag extends TimedFlag<Integer, HealFlag> {
@@ -42,7 +44,7 @@ public class HealFlag extends TimedFlag<Integer, HealFlag> {
42
44
  this,
43
45
  input,
44
46
  TranslatableCaption.of("invalid.not_a_number"),
45
- Template.of("value", input)
47
+ TagResolver.resolver("value", Tag.inserting(Component.text(input)))
46
48
  );
47
49
  }
48
50
  if (parsed < 1) {
@@ -50,7 +52,7 @@ public class HealFlag extends TimedFlag<Integer, HealFlag> {
50
52
  this,
51
53
  input,
52
54
  TranslatableCaption.of("invalid.number_not_positive"),
53
- Template.of("value", String.valueOf(parsed))
55
+ TagResolver.resolver("value", Tag.inserting(Component.text(parsed)))
54
56
  );
55
57
  }
56
58
  return parsed;
@@ -58,7 +60,7 @@ public class HealFlag extends TimedFlag<Integer, HealFlag> {
58
60
 
59
61
  @Override
60
62
  protected Integer mergeValue(Integer other) {
61
- return this.getValue().getValue() + other;
63
+ return this.getValue().value() + other;
62
64
  }
63
65
 
64
66
  @Override
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectilesFlag.java CHANGED
@@ -27,7 +27,7 @@ public class ProjectilesFlag extends BooleanFlag<ProjectilesFlag> {
27
27
  public static final ProjectilesFlag PROJECTILES_TRUE = new ProjectilesFlag(true);
28
28
  public static final ProjectilesFlag PROJECTILES_FALSE = new ProjectilesFlag(false);
29
29
 
30
- private ProjectilesFlag(boolean value){
30
+ private ProjectilesFlag(boolean value) {
31
31
  super(value, TranslatableCaption.of("flags.flag_description_projectiles"));
32
32
  }
33
33
 
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java CHANGED
@@ -21,7 +21,9 @@ package com.plotsquared.core.plot.flag.implementations;
21
21
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
22
22
  import com.plotsquared.core.plot.flag.FlagParseException;
23
23
  import com.plotsquared.core.plot.flag.PlotFlag;
24
- import net.kyori.adventure.text.minimessage.Template;
24
+ import net.kyori.adventure.text.Component;
25
+ import net.kyori.adventure.text.minimessage.tag.Tag;
26
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
25
27
  import org.checkerframework.checker.nullness.qual.NonNull;
26
28
  import org.checkerframework.checker.nullness.qual.Nullable;
27
29
 
@@ -47,7 +49,7 @@ public class TitlesFlag extends PlotFlag<TitlesFlag.TitlesFlagValue, TitlesFlag>
47
49
  this,
48
50
  input,
49
51
  TranslatableCaption.of("flags.flag_error_enum"),
50
- Template.of("list", "none, true, false")
52
+ TagResolver.resolver("list", Tag.inserting(Component.text("none, true, false")))
51
53
  );
52
54
  }
53
55
  return flagOf(titlesFlagValue);
Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java CHANGED
@@ -76,23 +76,10 @@ public abstract class TimedFlag<T, F extends PlotFlag<TimedFlag.Timed<T>, F>>
76
76
  return getValue().toString();
77
77
  }
78
78
 
79
- public static final class Timed<T> {
80
-
81
- private final int interval;
82
- private final T value;
83
-
84
- public Timed(int interval, T value) {
85
- this.interval = interval;
86
- this.value = value;
87
- }
88
-
89
- public int getInterval() {
90
- return interval;
91
- }
92
-
93
- public T getValue() {
94
- return value;
95
- }
79
+ public record Timed<T>(
80
+ int interval,
81
+ T value
82
+ ) {
96
83
 
97
84
  @Override
98
85
  public String toString() {
Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java CHANGED
@@ -137,15 +137,16 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
137
137
  }
138
138
 
139
139
  @Override
140
- public void addWorld(final @NonNull String worldName) {
140
+ public boolean addWorld(final @NonNull String worldName) {
141
141
  PlotWorld world = this.plotWorlds.get(worldName);
142
142
  if (world != null) {
143
- return;
143
+ return false;
144
144
  }
145
145
  // Create a new empty world. When a new area is added
146
146
  // the world will be re-recreated with the correct type
147
147
  world = new StandardPlotWorld(worldName, null);
148
148
  this.plotWorlds.put(worldName, world);
149
+ return true;
149
150
  }
150
151
 
151
152
  @Override
Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java CHANGED
@@ -110,8 +110,10 @@ public interface PlotAreaManager {
110
110
  * Add a world
111
111
  *
112
112
  * @param worldName Name of the world to add
113
+ * @return {@code true} if successful, {@code false} if world already existed
114
+ * @since 7.0.0
113
115
  */
114
- void addWorld(@NonNull String worldName);
116
+ boolean addWorld(@NonNull String worldName);
115
117
 
116
118
  /**
117
119
  * Remove a world
Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java CHANGED
@@ -76,6 +76,7 @@ public class SinglePlotArea extends GridPlotWorld {
76
76
  * Returns true if the given string matches the naming system used to identify single plot worlds
77
77
  * e.g. -1_5 represents plot id *;-1;5. "*" being the plot area name given to single plot world
78
78
  * {@link com.plotsquared.core.plot.PlotArea}.
79
+ *
79
80
  * @since 6.1.4
80
81
  */
81
82
  public static boolean isSinglePlotWorld(String worldName) {
Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java CHANGED
@@ -172,8 +172,8 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
172
172
  }
173
173
 
174
174
  @Override
175
- public void addWorld(final @NonNull String worldName) {
176
- super.addWorld(worldName);
175
+ public boolean addWorld(final @NonNull String worldName) {
176
+ return super.addWorld(worldName);
177
177
  }
178
178
 
179
179
  @Override
Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java CHANGED
@@ -18,7 +18,7 @@
18
18
  */
19
19
  package com.plotsquared.core.queue;
20
20
 
21
- import com.intellectualsites.annotations.DoNotUse;
21
+ import com.intellectualsites.annotations.NotPublic;
22
22
  import com.plotsquared.core.location.Location;
23
23
  import com.sk89q.jnbt.CompoundTag;
24
24
  import com.sk89q.worldedit.function.pattern.Pattern;
@@ -36,9 +36,11 @@ import org.checkerframework.checker.nullness.qual.Nullable;
36
36
  * The min and max points of this queue are offset according to the minimum point given in the constructor, and the offsets set
37
37
  * in {@link BlockArrayCacheScopedQueueCoordinator#setOffsetX(int)} and
38
38
  * {@link BlockArrayCacheScopedQueueCoordinator#setOffsetZ(int)}
39
+ * <p>
40
+ * Internal use only. Subject to change at any time and created for specific use cases.
39
41
  */
40
- @DoNotUse
41
- public class BlockArrayCacheScopedQueueCoordinator extends ScopedQueueCoordinator {
42
+ @NotPublic
43
+ public class BlockArrayCacheScopedQueueCoordinator extends ZeroedDelegateScopedQueueCoordinator {
42
44
 
43
45
  private final BlockState[][][] blockStates;
44
46
  private final int height;
@@ -52,6 +54,7 @@ public class BlockArrayCacheScopedQueueCoordinator extends ScopedQueueCoordinato
52
54
  private final int scopeMaxZ;
53
55
  private int offsetX = 0;
54
56
  private int offsetZ = 0;
57
+
55
58
  /**
56
59
  * Construct a new instance
57
60
  *
Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinator.java CHANGED
@@ -29,6 +29,7 @@ public abstract class ChunkCoordinator implements Runnable {
29
29
 
30
30
  /**
31
31
  * Cancel the chunk coordinator.
32
+ *
32
33
  * @since 6.0.10
33
34
  */
34
35
  public abstract void cancel();
Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java DELETED
@@ -1,163 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.core.queue;
20
-
21
- import com.plotsquared.core.location.Location;
22
- import com.sk89q.worldedit.function.pattern.Pattern;
23
- import com.sk89q.worldedit.math.BlockVector3;
24
- import com.sk89q.worldedit.world.World;
25
- import com.sk89q.worldedit.world.biome.BiomeType;
26
- import com.sk89q.worldedit.world.block.BaseBlock;
27
- import com.sk89q.worldedit.world.block.BlockState;
28
- import org.checkerframework.checker.nullness.qual.NonNull;
29
- import org.checkerframework.checker.nullness.qual.Nullable;
30
-
31
- /**
32
- * Queue that is limited to a single chunk. It does not allow a delegate queue and should be treated as a cache for changes to
33
- * be set to. Does not support tile entities or entities.
34
- *
35
- * @deprecated This class is poorly designed and will no longer be used in PlotSquared
36
- */
37
- @Deprecated(forRemoval = true, since = "6.8.0")
38
- public class ChunkQueueCoordinator extends ScopedQueueCoordinator {
39
-
40
- public final BiomeType[][][] biomeResult;
41
- public final BlockState[][][] result;
42
- private final int width;
43
- private final int length;
44
- private final BlockVector3 bot;
45
- private final BlockVector3 top;
46
- private final World weWorld;
47
-
48
- public ChunkQueueCoordinator(
49
- final @NonNull World weWorld,
50
- @NonNull BlockVector3 bot,
51
- @NonNull BlockVector3 top,
52
- boolean biomes
53
- ) {
54
- super(null, Location.at("", 0, weWorld.getMinY(), 0), Location.at("", 15, weWorld.getMaxY(), 15));
55
- this.weWorld = weWorld;
56
- this.width = top.getX() - bot.getX() + 1;
57
- this.length = top.getZ() - bot.getZ() + 1;
58
- this.result = new BlockState[weWorld.getMaxY() - weWorld.getMinY() + 1][width][length];
59
- this.biomeResult = biomes ? new BiomeType[weWorld.getMaxY() - weWorld.getMinY() + 1][width][length] : null;
60
- this.bot = bot;
61
- this.top = top;
62
- }
63
-
64
- public @NonNull BlockState[][][] getBlocks() {
65
- return result;
66
- }
67
-
68
- @Override
69
- public boolean setBiome(int x, int z, @NonNull BiomeType biomeType) {
70
- if (this.biomeResult != null) {
71
- for (int y = weWorld.getMinY(); y <= weWorld.getMaxY(); y++) {
72
- this.storeCacheBiome(x, y, z, biomeType);
73
- }
74
- return true;
75
- }
76
- return false;
77
- }
78
-
79
- @Override
80
- public boolean setBiome(int x, int y, int z, @NonNull BiomeType biomeType) {
81
- if (this.biomeResult != null) {
82
- this.storeCacheBiome(x, y, z, biomeType);
83
- return true;
84
- }
85
- return false;
86
- }
87
-
88
- @Override
89
- public boolean setBlock(int x, int y, int z, @NonNull BlockState id) {
90
- this.storeCache(x, y, z, id);
91
- return true;
92
- }
93
-
94
- @Override
95
- public boolean setBlock(int x, int y, int z, @NonNull Pattern pattern) {
96
- this.storeCache(x, y, z, pattern.applyBlock(BlockVector3.at(x, y, z)).toImmutableState());
97
- return true;
98
- }
99
-
100
- private void storeCache(final int x, final int y, final int z, final @NonNull BlockState id) {
101
- int yIndex = getYIndex(y);
102
- BlockState[][] resultY = result[yIndex];
103
- if (resultY == null) {
104
- result[yIndex] = resultY = new BlockState[length][];
105
- }
106
- BlockState[] resultYZ = resultY[z];
107
- if (resultYZ == null) {
108
- resultY[z] = resultYZ = new BlockState[width];
109
- }
110
- resultYZ[x] = id;
111
- }
112
-
113
- private void storeCacheBiome(final int x, final int y, final int z, final @NonNull BiomeType id) {
114
- int yIndex = getYIndex(y);
115
- BiomeType[][] resultY = biomeResult[yIndex];
116
- if (resultY == null) {
117
- biomeResult[yIndex] = resultY = new BiomeType[length][];
118
- }
119
- BiomeType[] resultYZ = resultY[z];
120
- if (resultYZ == null) {
121
- resultY[z] = resultYZ = new BiomeType[width];
122
- }
123
- resultYZ[x] = id;
124
- }
125
-
126
- @Override
127
- public boolean setBlock(int x, int y, int z, final @NonNull BaseBlock id) {
128
- this.storeCache(x, y, z, id.toImmutableState());
129
- return true;
130
- }
131
-
132
- @Override
133
- public @Nullable BlockState getBlock(int x, int y, int z) {
134
- BlockState[][] blocksY = result[getYIndex(y)];
135
- if (blocksY != null) {
136
- BlockState[] blocksYZ = blocksY[z];
137
- if (blocksYZ != null) {
138
- return blocksYZ[x];
139
- }
140
- }
141
- return null;
142
- }
143
-
144
- @Override
145
- public @Nullable World getWorld() {
146
- return weWorld;
147
- }
148
-
149
- @Override
150
- public @NonNull Location getMax() {
151
- return Location.at(getWorld().getName(), top.getX(), top.getY(), top.getZ());
152
- }
153
-
154
- @Override
155
- public @NonNull Location getMin() {
156
- return Location.at(getWorld().getName(), bot.getX(), bot.getY(), bot.getZ());
157
- }
158
-
159
- private int getYIndex(int y) {
160
- return y - weWorld.getMinY();
161
- }
162
-
163
- }
Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java CHANGED
@@ -43,11 +43,10 @@ import java.util.function.Consumer;
43
43
 
44
44
  public abstract class QueueCoordinator {
45
45
 
46
+ private final AtomicBoolean enqueued = new AtomicBoolean();
46
47
  private boolean forceSync = false;
47
48
  @Nullable
48
49
  private Object chunkObject;
49
- private final AtomicBoolean enqueued = new AtomicBoolean();
50
-
51
50
  @SuppressWarnings({"unused", "FieldCanBeLocal"})
52
51
  @Inject
53
52
  private GlobalBlockQueue blockQueue;
@@ -62,35 +61,17 @@ public abstract class QueueCoordinator {
62
61
  }
63
62
 
64
63
  /**
65
- * Get a {@link ScopedQueueCoordinator} limited to the chunk at the specific chunk Coordinates
66
- *
67
- * @param x chunk x coordinate
68
- * @param z chunk z coordinate
69
- * @return a new {@link ScopedQueueCoordinator}
70
- * @deprecated Use {@link ScopedQueueCoordinator#getForChunk(int, int, int, int)}
71
- */
72
- @Deprecated(forRemoval = true, since = "6.6.0")
73
- public ScopedQueueCoordinator getForChunk(int x, int z) {
74
- if (getWorld() == null) {
75
- return getForChunk(x, z, PlotSquared.platform().versionMinHeight(), PlotSquared.platform().versionMaxHeight());
76
- }
77
- return getForChunk(x, z, getWorld().getMinY(), getWorld().getMaxY());
78
- }
79
-
80
- /**
81
- * Get a {@link ScopedQueueCoordinator} limited to the chunk at the specific chunk Coordinates
64
+ * Get a {@link ZeroedDelegateScopedQueueCoordinator} limited to the chunk at the specific chunk Coordinates
82
65
  *
83
66
  * @param x chunk x coordinate
84
67
  * @param z chunk z coordinate
85
- * @return a new {@link ScopedQueueCoordinator}
86
- * @since 6.6.0
87
- * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
68
+ * @return a new {@link ZeroedDelegateScopedQueueCoordinator}
69
+ * @since 7.0.0
88
70
  */
89
- @Deprecated(forRemoval = true, since = "6.9.0")
90
- public ScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) {
71
+ public ZeroedDelegateScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) {
91
72
  int bx = x << 4;
92
73
  int bz = z << 4;
93
- return new ScopedQueueCoordinator(this, Location.at(getWorld().getName(), bx, minY, bz),
74
+ return new ZeroedDelegateScopedQueueCoordinator(this, Location.at(getWorld().getName(), bx, minY, bz),
94
75
  Location.at(getWorld().getName(), bx + 15, maxY, bz + 15)
95
76
  );
96
77
  }
Core/src/main/java/com/plotsquared/core/queue/{ScopedQueueCoordinator.java → ZeroedDelegateScopedQueueCoordinator.java} RENAMED
@@ -28,13 +28,13 @@ import org.checkerframework.checker.nullness.qual.NonNull;
28
28
  import org.checkerframework.checker.nullness.qual.Nullable;
29
29
 
30
30
  /**
31
- * Queue that only sets blocks with a designated X-Z area, will accept any Y values. Requires all blocks be set normalized in
32
- * the x and z directions, i.e. starting from 0,0. An offset of the minimum point of the region will then be applied to x and z.
31
+ * Queue that only sets blocks with a designated X-Z area, will accept any Y values. Requires all blocks be set normalized to
32
+ * zero in the x and z directions, i.e. starting from 0,0. An offset of the minimum point of the region will then be applied to
33
+ * x and z.
33
34
  *
34
- * @deprecated This should be renamed to NormalizedScopedQueueCoordinator or something.
35
+ * @since 7.0.0
35
36
  */
36
- @Deprecated(forRemoval = true, since = "6.8.0")
37
- public class ScopedQueueCoordinator extends DelegateQueueCoordinator {
37
+ public class ZeroedDelegateScopedQueueCoordinator extends DelegateQueueCoordinator {
38
38
 
39
39
  private final Location min;
40
40
  private final Location max;
@@ -49,8 +49,10 @@ public class ScopedQueueCoordinator extends DelegateQueueCoordinator {
49
49
 
50
50
  /**
51
51
  * Create a new ScopedQueueCoordinator instance that delegates to a given QueueCoordinator. Locations are inclusive.
52
+ *
53
+ * @since 7.0.0
52
54
  */
53
- public ScopedQueueCoordinator(@Nullable QueueCoordinator parent, @NonNull Location min, @NonNull Location max) {
55
+ public ZeroedDelegateScopedQueueCoordinator(@Nullable QueueCoordinator parent, @NonNull Location min, @NonNull Location max) {
54
56
  super(parent);
55
57
  this.min = min;
56
58
  this.max = max;
Core/src/main/java/com/plotsquared/core/queue/subscriber/DefaultProgressSubscriber.java CHANGED
@@ -30,10 +30,13 @@ import com.plotsquared.core.queue.ChunkCoordinator;
30
30
  import com.plotsquared.core.util.task.PlotSquaredTask;
31
31
  import com.plotsquared.core.util.task.TaskManager;
32
32
  import com.plotsquared.core.util.task.TaskTime;
33
- import net.kyori.adventure.text.minimessage.Template;
33
+ import net.kyori.adventure.text.Component;
34
+ import net.kyori.adventure.text.minimessage.tag.Tag;
35
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
34
36
  import org.checkerframework.checker.nullness.qual.NonNull;
35
37
 
36
38
  import javax.annotation.Nullable;
39
+ import java.util.Objects;
37
40
  import java.util.concurrent.atomic.AtomicBoolean;
38
41
 
39
42
  /**
@@ -90,11 +93,7 @@ public class DefaultProgressSubscriber implements ProgressSubscriber {
90
93
  this.actor = actor;
91
94
  this.interval = TaskTime.ms(interval);
92
95
  this.wait = TaskTime.ms(wait);
93
- if (caption == null) {
94
- this.caption = TranslatableCaption.of("working.progress");
95
- } else {
96
- this.caption = caption;
97
- }
96
+ this.caption = Objects.requireNonNullElseGet(caption, () -> TranslatableCaption.of("working.progress"));
98
97
  }
99
98
 
100
99
  @Override
@@ -113,7 +112,10 @@ public class DefaultProgressSubscriber implements ProgressSubscriber {
113
112
  }
114
113
  actor.sendMessage(
115
114
  caption,
116
- Template.of("progress", String.format("%.2f", this.progress.doubleValue() * 100))
115
+ TagResolver.resolver(
116
+ "progress",
117
+ Tag.inserting(Component.text(String.format("%.2f", this.progress.doubleValue() * 100)))
118
+ )
117
119
  );
118
120
  }, interval), wait);
119
121
  }
Core/src/main/java/com/plotsquared/core/services/plots/AutoQuery.java ADDED
@@ -0,0 +1,94 @@
1
+ /*
2
+ * PlotSquared, a land and world management plugin for Minecraft.
3
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
+ * Copyright (C) IntellectualSites team and contributors
5
+ *
6
+ * This program is free software: you can redistribute it and/or modify
7
+ * it under the terms of the GNU General Public License as published by
8
+ * the Free Software Foundation, either version 3 of the License, or
9
+ * (at your option) any later version.
10
+ *
11
+ * This program is distributed in the hope that it will be useful,
12
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
+ * GNU General Public License for more details.
15
+ *
16
+ * You should have received a copy of the GNU General Public License
17
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
+ */
19
+ package com.plotsquared.core.services.plots;
20
+
21
+ import com.plotsquared.core.player.PlotPlayer;
22
+ import com.plotsquared.core.plot.PlotArea;
23
+ import com.plotsquared.core.plot.PlotId;
24
+ import org.checkerframework.checker.nullness.qual.NonNull;
25
+ import org.checkerframework.checker.nullness.qual.Nullable;
26
+
27
+ /**
28
+ * Crate a new auto query
29
+ *
30
+ * @param player Player to claim for
31
+ * @param startId Plot ID to start searching from
32
+ * @param sizeX Number of plots along the X axis
33
+ * @param sizeZ Number of plots along the Z axis
34
+ * @param plotArea Plot area to search in
35
+ */
36
+ public record AutoQuery(
37
+ @NonNull PlotPlayer<?> player,
38
+ @Nullable PlotId startId,
39
+ int sizeX,
40
+ int sizeZ,
41
+ @NonNull PlotArea plotArea
42
+ ) {
43
+
44
+ /**
45
+ * Get the player that the plots are meant for
46
+ *
47
+ * @return Player
48
+ */
49
+ @Override
50
+ public @NonNull PlotPlayer<?> player() {
51
+ return this.player;
52
+ }
53
+
54
+ /**
55
+ * Get the plot ID to start searching from
56
+ *
57
+ * @return Start ID
58
+ */
59
+ @Override
60
+ public @Nullable PlotId startId() {
61
+ return this.startId;
62
+ }
63
+
64
+ /**
65
+ * Get the number of plots along the X axis
66
+ *
67
+ * @return Number of plots along the X axis
68
+ */
69
+ @Override
70
+ public int sizeX() {
71
+ return this.sizeX;
72
+ }
73
+
74
+ /**
75
+ * Get the number of plots along the Z axis
76
+ *
77
+ * @return Number of plots along the Z axis
78
+ */
79
+ @Override
80
+ public int sizeZ() {
81
+ return this.sizeZ;
82
+ }
83
+
84
+ /**
85
+ * Get the plot area to search in
86
+ *
87
+ * @return Plot area
88
+ */
89
+ @Override
90
+ public @NonNull PlotArea plotArea() {
91
+ return this.plotArea;
92
+ }
93
+
94
+ }
Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java CHANGED
@@ -21,9 +21,7 @@ package com.plotsquared.core.services.plots;
21
21
  import cloud.commandframework.services.types.Service;
22
22
  import com.google.common.cache.Cache;
23
23
  import com.google.common.cache.CacheBuilder;
24
- import com.plotsquared.core.player.PlotPlayer;
25
24
  import com.plotsquared.core.plot.Plot;
26
- import com.plotsquared.core.plot.PlotArea;
27
25
  import com.plotsquared.core.plot.PlotAreaType;
28
26
  import com.plotsquared.core.plot.PlotId;
29
27
  import org.checkerframework.checker.nullness.qual.NonNull;
@@ -34,88 +32,12 @@ import java.util.List;
34
32
  import java.util.concurrent.TimeUnit;
35
33
  import java.util.function.Predicate;
36
34
 
37
- public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>> {
35
+ public interface AutoService extends Service<AutoQuery, List<Plot>> {
38
36
 
39
37
  Cache<PlotId, Plot> plotCandidateCache = CacheBuilder.newBuilder()
40
38
  .expireAfterWrite(20, TimeUnit.SECONDS).build();
41
39
  Object plotLock = new Object();
42
40
 
43
- final class AutoQuery {
44
-
45
- private final PlotPlayer<?> player;
46
- private final PlotId startId;
47
- private final int sizeX;
48
- private final int sizeZ;
49
- private final PlotArea plotArea;
50
-
51
- /**
52
- * Crate a new auto query
53
- *
54
- * @param player Player to claim for
55
- * @param startId Plot ID to start searching from
56
- * @param sizeX Number of plots along the X axis
57
- * @param sizeZ Number of plots along the Z axis
58
- * @param plotArea Plot area to search in
59
- */
60
- public AutoQuery(
61
- final @NonNull PlotPlayer<?> player, final @Nullable PlotId startId,
62
- final int sizeX, final int sizeZ, final @NonNull PlotArea plotArea
63
- ) {
64
- this.player = player;
65
- this.startId = startId;
66
- this.sizeX = sizeX;
67
- this.sizeZ = sizeZ;
68
- this.plotArea = plotArea;
69
- }
70
-
71
- /**
72
- * Get the player that the plots are meant for
73
- *
74
- * @return Player
75
- */
76
- public @NonNull PlotPlayer<?> getPlayer() {
77
- return this.player;
78
- }
79
-
80
- /**
81
- * Get the plot ID to start searching from
82
- *
83
- * @return Start ID
84
- */
85
- public @Nullable PlotId getStartId() {
86
- return this.startId;
87
- }
88
-
89
- /**
90
- * Get the number of plots along the X axis
91
- *
92
- * @return Number of plots along the X axis
93
- */
94
- public int getSizeX() {
95
- return this.sizeX;
96
- }
97
-
98
- /**
99
- * Get the number of plots along the Z axis
100
- *
101
- * @return Number of plots along the Z axis
102
- */
103
- public int getSizeZ() {
104
- return this.sizeZ;
105
- }
106
-
107
- /**
108
- * Get the plot area to search in
109
- *
110
- * @return Plot area
111
- */
112
- public @NonNull PlotArea getPlotArea() {
113
- return this.plotArea;
114
- }
115
-
116
- }
117
-
118
-
119
41
  final class DefaultAutoService implements AutoService {
120
42
 
121
43
  @Override
@@ -125,17 +47,16 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
125
47
 
126
48
  }
127
49
 
128
-
129
50
  final class SinglePlotService implements AutoService, Predicate<AutoQuery> {
130
51
 
131
52
  @Nullable
132
53
  @Override
133
54
  public List<Plot> handle(@NonNull AutoQuery autoQuery) {
134
55
  Plot plot;
135
- PlotId nextId = autoQuery.getStartId();
56
+ PlotId nextId = autoQuery.startId();
136
57
  do {
137
58
  synchronized (plotLock) {
138
- plot = autoQuery.getPlotArea().getNextFreePlot(autoQuery.getPlayer(), nextId);
59
+ plot = autoQuery.plotArea().getNextFreePlot(autoQuery.player(), nextId);
139
60
  if (plot != null && plotCandidateCache.getIfPresent(plot.getId()) == null) {
140
61
  plotCandidateCache.put(plot.getId(), plot);
141
62
  return Collections.singletonList(plot);
@@ -151,12 +72,11 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
151
72
 
152
73
  @Override
153
74
  public boolean test(final @NonNull AutoQuery autoQuery) {
154
- return autoQuery.sizeX == 1 && autoQuery.sizeZ == 1;
75
+ return autoQuery.sizeX() == 1 && autoQuery.sizeZ() == 1;
155
76
  }
156
77
 
157
78
  }
158
79
 
159
-
160
80
  final class MultiPlotService implements AutoService, Predicate<AutoQuery> {
161
81
 
162
82
  @Override
@@ -166,14 +86,14 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
166
86
  while (true) {
167
87
  synchronized (plotLock) {
168
88
  final PlotId start =
169
- autoQuery.getPlotArea().getMeta("lastPlot", PlotId.of(0, 0)).getNextId();
89
+ autoQuery.plotArea().getMeta("lastPlot", PlotId.of(0, 0)).getNextId();
170
90
  final PlotId end = PlotId.of(
171
- start.getX() + autoQuery.getSizeX() - 1,
172
- start.getY() + autoQuery.getSizeZ() - 1
91
+ start.getX() + autoQuery.sizeX() - 1,
92
+ start.getY() + autoQuery.sizeZ() - 1
173
93
  );
174
94
  final List<Plot> plots =
175
- autoQuery.getPlotArea().canClaim(autoQuery.getPlayer(), start, end);
176
- autoQuery.getPlotArea().setMeta("lastPlot", start); // set entry point for next try
95
+ autoQuery.plotArea().canClaim(autoQuery.player(), start, end);
96
+ autoQuery.plotArea().setMeta("lastPlot", start); // set entry point for next try
177
97
  if (plots != null && !plots.isEmpty()) {
178
98
  for (final Plot plot : plots) {
179
99
  if (plotCandidateCache.getIfPresent(plot.getId()) != null) {
@@ -189,7 +109,7 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
189
109
 
190
110
  @Override
191
111
  public boolean test(final @NonNull AutoQuery autoQuery) {
192
- return autoQuery.getPlotArea().getType() != PlotAreaType.PARTIAL;
112
+ return autoQuery.plotArea().getType() != PlotAreaType.PARTIAL;
193
113
  }
194
114
 
195
115
  }
Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java CHANGED
@@ -32,7 +32,9 @@ import com.plotsquared.core.plot.PlotAreaType;
32
32
  import com.plotsquared.core.plot.PlotId;
33
33
  import com.plotsquared.core.util.SetupUtils;
34
34
  import com.plotsquared.core.util.StringMan;
35
- import net.kyori.adventure.text.minimessage.Template;
35
+ import net.kyori.adventure.text.Component;
36
+ import net.kyori.adventure.text.minimessage.tag.Tag;
37
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
36
38
  import org.checkerframework.checker.nullness.qual.NonNull;
37
39
  import org.checkerframework.checker.nullness.qual.Nullable;
38
40
 
@@ -206,7 +208,10 @@ public enum CommonSetupSteps implements SetupStep {
206
208
  }
207
209
  if (PlotSquared.platform().worldUtil().isWorld(argument)) {
208
210
  if (PlotSquared.get().getPlotAreaManager().hasPlotArea(argument)) {
209
- plotPlayer.sendMessage(TranslatableCaption.of("setup.setup_world_taken"), Template.of("value", argument));
211
+ plotPlayer.sendMessage(
212
+ TranslatableCaption.of("setup.setup_world_taken"),
213
+ TagResolver.resolver("value", Tag.inserting(Component.text(argument)))
214
+ );
210
215
  return this;
211
216
  }
212
217
  plotPlayer.sendMessage(TranslatableCaption.of("setup.setup_world_apply_plotsquared"));
Core/src/main/java/com/plotsquared/core/setup/PlotAreaBuilder.java CHANGED
@@ -25,11 +25,17 @@ import com.plotsquared.core.plot.PlotAreaTerrainType;
25
25
  import com.plotsquared.core.plot.PlotAreaType;
26
26
  import com.plotsquared.core.plot.PlotId;
27
27
  import com.plotsquared.core.util.SetupUtils;
28
+ import org.jetbrains.annotations.Contract;
29
+ import org.jetbrains.annotations.NotNull;
30
+ import org.jetbrains.annotations.Nullable;
31
+
32
+ import java.util.Objects;
28
33
 
29
34
  public class PlotAreaBuilder {
30
35
 
31
36
  private String generatorName;
32
37
  private String plotManager;
38
+ @Nullable
33
39
  private PlotAreaType plotAreaType;
34
40
  private PlotAreaTerrainType terrainType;
35
41
  private String worldName;
@@ -85,8 +91,10 @@ public class PlotAreaBuilder {
85
91
  return this.plotManager;
86
92
  }
87
93
 
94
+ @NotNull
95
+ @Contract(" -> !null")
88
96
  public PlotAreaType plotAreaType() {
89
- return this.plotAreaType;
97
+ return Objects.requireNonNullElse(this.plotAreaType, PlotAreaType.NORMAL);
90
98
  }
91
99
 
92
100
  public PlotAreaTerrainType terrainType() {
@@ -127,7 +135,8 @@ public class PlotAreaBuilder {
127
135
  return this;
128
136
  }
129
137
 
130
- public PlotAreaBuilder plotAreaType(PlotAreaType plotAreaType) {
138
+ public PlotAreaBuilder plotAreaType(@NotNull PlotAreaType plotAreaType) {
139
+ Objects.requireNonNull(plotAreaType, "PlotAreaType must not be null");
131
140
  this.plotAreaType = plotAreaType;
132
141
  return this;
133
142
  }
Core/src/main/java/com/plotsquared/core/setup/SettingsNodeStep.java CHANGED
@@ -24,7 +24,9 @@ import com.plotsquared.core.configuration.ConfigurationNode;
24
24
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
25
25
  import com.plotsquared.core.player.PlotPlayer;
26
26
  import com.plotsquared.core.util.TabCompletions;
27
- import net.kyori.adventure.text.minimessage.Template;
27
+ import net.kyori.adventure.text.Component;
28
+ import net.kyori.adventure.text.minimessage.tag.Tag;
29
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
28
30
  import org.checkerframework.checker.nullness.qual.NonNull;
29
31
  import org.checkerframework.checker.nullness.qual.Nullable;
30
32
 
@@ -46,10 +48,10 @@ public class SettingsNodeStep implements SetupStep {
46
48
  ) {
47
49
  this.configurationNode = configurationNode;
48
50
  this.id = id;
49
- if (wrapper.getSettingsNodes().length > id + 1) {
50
- this.next = new SettingsNodeStep(wrapper.getSettingsNodes()[id + 1], id + 1, wrapper);
51
+ if (wrapper.settingsNodes().length > id + 1) {
52
+ this.next = new SettingsNodeStep(wrapper.settingsNodes()[id + 1], id + 1, wrapper);
51
53
  } else {
52
- this.next = wrapper.getAfterwards();
54
+ this.next = wrapper.afterwards();
53
55
  }
54
56
  }
55
57
 
@@ -77,10 +79,15 @@ public class SettingsNodeStep implements SetupStep {
77
79
  public void announce(PlotPlayer<?> plotPlayer) {
78
80
  plotPlayer.sendMessage(
79
81
  TranslatableCaption.of("setup.setup_step"),
80
- Template.of("step", String.valueOf(this.getId() + 1)),
81
- Template.of("description", this.configurationNode.getDescription().getComponent(plotPlayer)),
82
- Template.of("type", this.configurationNode.getType().getType()),
83
- Template.of("value", String.valueOf(this.configurationNode.getDefaultValue()))
82
+ TagResolver.builder()
83
+ .tag("step", Tag.inserting(Component.text(this.getId() + 1)))
84
+ .tag(
85
+ "description",
86
+ Tag.inserting(this.configurationNode.getDescription().toComponent(plotPlayer))
87
+ )
88
+ .tag("type", Tag.inserting(Component.text(this.configurationNode.getType().getType())))
89
+ .tag("value", Tag.inserting(Component.text(this.configurationNode.getDefaultValue().toString())))
90
+ .build()
84
91
  );
85
92
  }
86
93
 
Core/src/main/java/com/plotsquared/core/setup/SettingsNodesWrapper.java CHANGED
@@ -23,15 +23,10 @@ import com.plotsquared.core.configuration.ConfigurationNode;
23
23
  /**
24
24
  * This class wraps an array of {@link ConfigurationNode}s.
25
25
  */
26
- public class SettingsNodesWrapper {
27
-
28
- private final ConfigurationNode[] settingsNodes;
29
- private final SetupStep afterwards;
30
-
31
- public SettingsNodesWrapper(final ConfigurationNode[] settingsNodes, final SetupStep afterwards) {
32
- this.settingsNodes = settingsNodes;
33
- this.afterwards = afterwards;
34
- }
26
+ public record SettingsNodesWrapper(
27
+ ConfigurationNode[] settingsNodes,
28
+ SetupStep afterwards
29
+ ) {
35
30
 
36
31
  /**
37
32
  * Returns the first step of this wrapper or the step or the
@@ -43,12 +38,4 @@ public class SettingsNodesWrapper {
43
38
  return this.settingsNodes.length == 0 ? this.afterwards : new SettingsNodeStep(this.settingsNodes[0], 0, this);
44
39
  }
45
40
 
46
- public ConfigurationNode[] getSettingsNodes() {
47
- return this.settingsNodes;
48
- }
49
-
50
- public SetupStep getAfterwards() {
51
- return this.afterwards;
52
- }
53
-
54
41
  }
Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java CHANGED
@@ -65,9 +65,9 @@ public final class LockRepository {
65
65
  * @param runnable Action to run when the lock is available
66
66
  */
67
67
  public void useLock(final @NonNull LockKey key, final @NonNull Runnable runnable) {
68
- try (LockAccess ignored = lock(key)) {
69
- runnable.run();
70
- }
68
+ try (LockAccess ignored = lock(key)) {
69
+ runnable.run();
70
+ }
71
71
  }
72
72
 
73
73
  /**
Core/src/main/java/com/plotsquared/core/util/BlockUtil.java CHANGED
@@ -31,8 +31,6 @@ import com.sk89q.worldedit.world.registry.LegacyMapper;
31
31
  import org.checkerframework.checker.nullness.qual.NonNull;
32
32
  import org.checkerframework.checker.nullness.qual.Nullable;
33
33
 
34
- import java.util.Map;
35
-
36
34
  /**
37
35
  * {@link BlockState} related utility methods
38
36
  */
@@ -109,38 +107,4 @@ public final class BlockUtil {
109
107
  }
110
108
  }
111
109
 
112
- /**
113
- * Parse a comma delimited list of block states
114
- *
115
- * @param commaDelimited List of block states
116
- * @return Parsed block states
117
- * @deprecated Unused internally. Scheduled for removal in next major release.
118
- */
119
- @Deprecated(forRemoval = true, since = "6.11.1")
120
- public static @NonNull BlockState[] parse(final @NonNull String commaDelimited) {
121
- final String[] split = commaDelimited.split(",(?![^\\(\\[]*[\\]\\)])");
122
- final BlockState[] result = new BlockState[split.length];
123
- for (int i = 0; i < split.length; i++) {
124
- result[i] = get(split[i]);
125
- }
126
- return result;
127
- }
128
-
129
- /**
130
- * Deserialize a serialized {@link BlockState}
131
- *
132
- * @param map Serialized block state
133
- * @return Deserialized block state, or {@code null} if the map is
134
- * not a properly serialized block state
135
- * @deprecated Unused internally. Scheduled for removal in next major release.
136
- */
137
- @Deprecated(forRemoval = true, since = "6.11.1")
138
- public static @Nullable BlockState deserialize(final @NonNull Map<String, Object> map) {
139
- if (map.containsKey("material")) {
140
- final Object object = map.get("material");
141
- return get(object.toString());
142
- }
143
- return null;
144
- }
145
-
146
110
  }
Core/src/main/java/com/plotsquared/core/util/ChunkManager.java CHANGED
@@ -21,7 +21,7 @@ package com.plotsquared.core.util;
21
21
  import com.plotsquared.core.PlotSquared;
22
22
  import com.plotsquared.core.location.Location;
23
23
  import com.plotsquared.core.queue.QueueCoordinator;
24
- import com.plotsquared.core.queue.ScopedQueueCoordinator;
24
+ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
25
25
  import com.plotsquared.core.util.task.RunnableVal;
26
26
  import com.sk89q.worldedit.math.BlockVector2;
27
27
  import com.sk89q.worldedit.world.World;
@@ -32,16 +32,15 @@ import java.util.concurrent.ConcurrentHashMap;
32
32
 
33
33
  public abstract class ChunkManager {
34
34
 
35
- private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> forceChunks = new ConcurrentHashMap<>();
36
- private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> addChunks = new ConcurrentHashMap<>();
35
+ private static final Map<BlockVector2, RunnableVal<ZeroedDelegateScopedQueueCoordinator>> forceChunks = new ConcurrentHashMap<>();
36
+ private static final Map<BlockVector2, RunnableVal<ZeroedDelegateScopedQueueCoordinator>> addChunks = new ConcurrentHashMap<>();
37
37
 
38
38
  /**
39
- * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
39
+ * @since 7.0.0
40
40
  */
41
- @Deprecated(forRemoval = true, since = "6.9.0")
42
41
  public static void setChunkInPlotArea(
43
- RunnableVal<ScopedQueueCoordinator> force,
44
- RunnableVal<ScopedQueueCoordinator> add,
42
+ RunnableVal<ZeroedDelegateScopedQueueCoordinator> force,
43
+ RunnableVal<ZeroedDelegateScopedQueueCoordinator> add,
45
44
  String world,
46
45
  BlockVector2 loc
47
46
  ) {
@@ -50,8 +49,8 @@ public abstract class ChunkManager {
50
49
  if (PlotSquared.get().getPlotAreaManager().isAugmented(world) && PlotSquared.get().isNonStandardGeneration(world, loc)) {
51
50
  int blockX = loc.getX() << 4;
52
51
  int blockZ = loc.getZ() << 4;
53
- ScopedQueueCoordinator scoped =
54
- new ScopedQueueCoordinator(
52
+ ZeroedDelegateScopedQueueCoordinator scoped =
53
+ new ZeroedDelegateScopedQueueCoordinator(
55
54
  queue,
56
55
  Location.at(world, blockX, weWorld.getMinY(), blockZ),
57
56
  Location.at(world, blockX + 15, weWorld.getMaxY(), blockZ + 15)
@@ -77,11 +76,10 @@ public abstract class ChunkManager {
77
76
  }
78
77
 
79
78
  /**
80
- * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
79
+ * @since 7.0.0
81
80
  */
82
- @Deprecated(forRemoval = true, since = "6.9.0")
83
- public static boolean preProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) {
84
- final RunnableVal<ScopedQueueCoordinator> forceChunk = forceChunks.get(loc);
81
+ public static boolean preProcessChunk(BlockVector2 loc, ZeroedDelegateScopedQueueCoordinator queue) {
82
+ final RunnableVal<ZeroedDelegateScopedQueueCoordinator> forceChunk = forceChunks.get(loc);
85
83
  if (forceChunk != null) {
86
84
  forceChunk.run(queue);
87
85
  forceChunks.remove(loc);
@@ -91,11 +89,10 @@ public abstract class ChunkManager {
91
89
  }
92
90
 
93
91
  /**
94
- * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
92
+ * @since 7.0.0
95
93
  */
96
- @Deprecated(forRemoval = true, since = "6.9.0")
97
- public static boolean postProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) {
98
- final RunnableVal<ScopedQueueCoordinator> addChunk = forceChunks.get(loc);
94
+ public static boolean postProcessChunk(BlockVector2 loc, ZeroedDelegateScopedQueueCoordinator queue) {
95
+ final RunnableVal<ZeroedDelegateScopedQueueCoordinator> addChunk = forceChunks.get(loc);
99
96
  if (addChunk != null) {
100
97
  addChunk.run(queue);
101
98
  addChunks.remove(loc);
Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java CHANGED
@@ -18,10 +18,6 @@
18
18
  */
19
19
  package com.plotsquared.core.util;
20
20
 
21
- import com.plotsquared.core.location.Location;
22
- import com.sk89q.worldedit.math.BlockVector2;
23
- import org.checkerframework.checker.nullness.qual.NonNull;
24
-
25
21
  /**
26
22
  * This cache is used for world generation and just saves a bit of calculation time when checking if something is in the plot area.
27
23
  */
@@ -107,24 +103,4 @@ public class ChunkUtil {
107
103
  return z_loc[j];
108
104
  }
109
105
 
110
- /**
111
- * Returns true if the region pos1-pos2 contains the chunk
112
- *
113
- * @param pos1 Region minimum point
114
- * @param pos2 Region maximum point
115
- * @param chunk BlockVector2 of chunk coordinates
116
- * @return {@code true} if the region pos1-pos2 contains the chunk
117
- * @deprecated Unused internally. Scheduled for removal in next major release.
118
- */
119
- @Deprecated(forRemoval = true, since = "6.11.1")
120
- public static boolean isWholeChunk(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockVector2 chunk) {
121
- int x1 = pos1.getX();
122
- int z1 = pos1.getZ();
123
- int x2 = pos2.getX();
124
- int z2 = pos2.getZ();
125
- int cx = chunk.getX() << 4;
126
- int cz = chunk.getZ() << 4;
127
- return cx > x1 && cz > z1 && cx < x2 && cz < z2;
128
- }
129
-
130
106
  }
Core/src/main/java/com/plotsquared/core/util/ComponentHelper.java ADDED
@@ -0,0 +1,65 @@
1
+ /*
2
+ * PlotSquared, a land and world management plugin for Minecraft.
3
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
+ * Copyright (C) IntellectualSites team and contributors
5
+ *
6
+ * This program is free software: you can redistribute it and/or modify
7
+ * it under the terms of the GNU General Public License as published by
8
+ * the Free Software Foundation, either version 3 of the License, or
9
+ * (at your option) any later version.
10
+ *
11
+ * This program is distributed in the hope that it will be useful,
12
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
+ * GNU General Public License for more details.
15
+ *
16
+ * You should have received a copy of the GNU General Public License
17
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
+ */
19
+ package com.plotsquared.core.util;
20
+
21
+ import net.kyori.adventure.text.Component;
22
+ import net.kyori.adventure.text.ComponentLike;
23
+ import net.kyori.adventure.text.TextComponent;
24
+
25
+ import java.util.Collection;
26
+
27
+ /**
28
+ * A utility class for modifying components.
29
+ *
30
+ * @since 7.0.0
31
+ */
32
+ public class ComponentHelper {
33
+
34
+ /**
35
+ * Joins multiple {@link Component}s into one final {@link ComponentLike}
36
+ *
37
+ * @param components The components to join
38
+ * @param delimiter The delimiter to use between the components
39
+ * @return The joined components
40
+ * @since 7.0.0
41
+ */
42
+ public static ComponentLike join(Collection<? extends ComponentLike> components, Component delimiter) {
43
+ return join(components.toArray(ComponentLike[]::new), delimiter);
44
+ }
45
+
46
+ /**
47
+ * Joins multiple {@link ComponentLike}s into one final {@link ComponentLike}
48
+ *
49
+ * @param components The components to join
50
+ * @param delimiter The delimiter to use between the components
51
+ * @return The joined components
52
+ * @since 7.0.0
53
+ */
54
+ public static Component join(ComponentLike[] components, Component delimiter) {
55
+ TextComponent.Builder builder = Component.text();
56
+ for (int i = 0, j = components.length; i < j; i++) {
57
+ if (i > 0) {
58
+ builder.append(delimiter);
59
+ }
60
+ builder.append(components[i]);
61
+ }
62
+ return builder.build();
63
+ }
64
+
65
+ }
Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java CHANGED
@@ -76,7 +76,9 @@ import com.sk89q.worldedit.entity.Entity;
76
76
  import com.sk89q.worldedit.function.pattern.Pattern;
77
77
  import com.sk89q.worldedit.world.block.BlockType;
78
78
  import com.sk89q.worldedit.world.block.BlockTypes;
79
- import net.kyori.adventure.text.minimessage.Template;
79
+ import net.kyori.adventure.text.Component;
80
+ import net.kyori.adventure.text.minimessage.tag.Tag;
81
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
80
82
  import org.checkerframework.checker.nullness.qual.NonNull;
81
83
  import org.checkerframework.checker.nullness.qual.Nullable;
82
84
 
@@ -343,8 +345,10 @@ public class EventDispatcher {
343
345
  if (!area.buildRangeContainsY(location.getY()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
344
346
  player.sendMessage(
345
347
  TranslatableCaption.of("height.height_limit"),
346
- Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
347
- Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
348
+ TagResolver.builder()
349
+ .tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
350
+ .tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
351
+ .build()
348
352
  );
349
353
  return false;
350
354
  }
@@ -355,11 +359,13 @@ public class EventDispatcher {
355
359
  }
356
360
  }
357
361
  switch (type) {
358
- case TELEPORT_OBJECT:
362
+ case TELEPORT_OBJECT -> {
359
363
  return false;
360
- case READ:
364
+ }
365
+ case READ -> {
361
366
  return true;
362
- case INTERACT_BLOCK: {
367
+ }
368
+ case INTERACT_BLOCK -> {
363
369
  if (plot == null) {
364
370
  final List<BlockTypeWrapper> use = area.getRoadFlag(UseFlag.class);
365
371
  for (final BlockTypeWrapper blockTypeWrapper : use) {
@@ -389,12 +395,12 @@ public class EventDispatcher {
389
395
  if (notifyPerms) {
390
396
  player.sendMessage(
391
397
  TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
392
- Template.of("flag", PlaceFlag.getFlagName(UseFlag.class))
398
+ TagResolver.resolver("flag", Tag.inserting(PlaceFlag.getFlagNameComponent(UseFlag.class)))
393
399
  );
394
400
  }
395
401
  return false;
396
402
  }
397
- case TRIGGER_PHYSICAL: {
403
+ case TRIGGER_PHYSICAL -> {
398
404
  if (plot == null) {
399
405
  final List<BlockTypeWrapper> use = area.getRoadFlag(UseFlag.class);
400
406
  for (final BlockTypeWrapper blockTypeWrapper : use) {
@@ -426,7 +432,7 @@ public class EventDispatcher {
426
432
  false
427
433
  );
428
434
  }
429
- case SPAWN_MOB: {
435
+ case SPAWN_MOB -> {
430
436
  if (plot == null) {
431
437
  return player.hasPermission(
432
438
  Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
@@ -456,13 +462,19 @@ public class EventDispatcher {
456
462
  if (notifyPerms) {
457
463
  player.sendMessage(
458
464
  TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
459
- Template.of("flag", PlotFlag.getFlagName(MobPlaceFlag.class)
460
- + '/' + PlotFlag.getFlagName(PlaceFlag.class))
465
+ TagResolver.resolver(
466
+ "flag",
467
+ Tag.inserting(
468
+ PlotFlag.getFlagNameComponent(MobPlaceFlag.class)
469
+ .append(Component.text("/"))
470
+ .append(PlotFlag.getFlagNameComponent(PlaceFlag.class))
471
+ )
472
+ )
461
473
  );
462
474
  }
463
475
  return false;
464
476
  }
465
- case PLACE_MISC: {
477
+ case PLACE_MISC -> {
466
478
  if (plot == null) {
467
479
  return player.hasPermission(
468
480
  Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
@@ -492,13 +504,19 @@ public class EventDispatcher {
492
504
  if (notifyPerms) {
493
505
  player.sendMessage(
494
506
  TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
495
- Template.of("flag", PlotFlag.getFlagName(MiscPlaceFlag.class)
496
- + '/' + PlotFlag.getFlagName(PlaceFlag.class))
507
+ TagResolver.resolver(
508
+ "flag",
509
+ Tag.inserting(
510
+ PlotFlag.getFlagNameComponent(MiscPlaceFlag.class)
511
+ .append(Component.text("/"))
512
+ .append(PlotFlag.getFlagNameComponent(PlaceFlag.class))
513
+ )
514
+ )
497
515
  );
498
516
  }
499
517
  return false;
500
518
  }
501
- case PLACE_VEHICLE:
519
+ case PLACE_VEHICLE -> {
502
520
  if (plot == null) {
503
521
  return player.hasPermission(
504
522
  Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
@@ -510,8 +528,9 @@ public class EventDispatcher {
510
528
  );
511
529
  }
512
530
  return plot.getFlag(VehiclePlaceFlag.class);
513
- default:
514
- break;
531
+ }
532
+ default -> {
533
+ }
515
534
  }
516
535
  return true;
517
536
  }
Core/src/main/java/com/plotsquared/core/util/FileBytes.java CHANGED
@@ -18,14 +18,9 @@
18
18
  */
19
19
  package com.plotsquared.core.util;
20
20
 
21
- public class FileBytes {
22
-
23
- public final String path;
24
- public final byte[] data;
25
-
26
- public FileBytes(String path, byte[] data) {
27
- this.path = path;
28
- this.data = data;
29
- }
21
+ public record FileBytes(
22
+ String path,
23
+ byte[] data
24
+ ) {
30
25
 
31
26
  }
Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java CHANGED
@@ -35,8 +35,8 @@ public abstract class InventoryUtil {
35
35
  * Attempts to set an item into a {@link PlotInventory} while also checking the existence of the material
36
36
  *
37
37
  * @param plotInventory The inventory where the item should be placed
38
- * @param index The index where to place the item
39
- * @param item The item to place into the inventory
38
+ * @param index The index where to place the item
39
+ * @param item The item to place into the inventory
40
40
  * @return {@code true} if the item could be placed, {@code false} otherwise (e.g. item not available in current version)
41
41
  * @since 6.5.0
42
42
  */
@@ -49,12 +49,14 @@ public abstract class InventoryUtil {
49
49
  * Attempts to set an item into a {@link PlotInventory}
50
50
  *
51
51
  * @param plotInventory The inventory where the item should be placed
52
- * @param index The index where to place the item
53
- * @param item The item to place into the inventory
52
+ * @param index The index where to place the item
53
+ * @param item The item to place into the inventory
54
54
  * @see #setItemChecked(PlotInventory, int, PlotItemStack)
55
55
  */
56
- public void setItem(final PlotInventory plotInventory, final int index,
57
- final PlotItemStack item) {
56
+ public void setItem(
57
+ final PlotInventory plotInventory, final int index,
58
+ final PlotItemStack item
59
+ ) {
58
60
  setItemChecked(plotInventory, index, item);
59
61
  }
60
62
 
Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java CHANGED
@@ -24,7 +24,9 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
24
24
  import com.plotsquared.core.player.ConsolePlayer;
25
25
  import com.plotsquared.core.plot.BlockBucket;
26
26
  import com.sk89q.worldedit.world.block.BlockState;
27
- import net.kyori.adventure.text.minimessage.Template;
27
+ import net.kyori.adventure.text.Component;
28
+ import net.kyori.adventure.text.minimessage.tag.Tag;
29
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
28
30
  import org.apache.logging.log4j.LogManager;
29
31
  import org.apache.logging.log4j.Logger;
30
32
  import org.checkerframework.checker.nullness.qual.NonNull;
@@ -112,8 +114,10 @@ public final class LegacyConverter {
112
114
  this.setString(section, key, bucket);
113
115
  ConsolePlayer.getConsole().sendMessage(
114
116
  TranslatableCaption.of("legacyconfig.legacy_config_replaced"),
115
- Template.of("value1", block),
116
- Template.of("value2", bucket.toString())
117
+ TagResolver.builder()
118
+ .tag("value1", Tag.inserting(Component.text(block)))
119
+ .tag("value2", Tag.inserting(Component.text(bucket.toString())))
120
+ .build()
117
121
  );
118
122
  }
119
123
 
@@ -128,8 +132,10 @@ public final class LegacyConverter {
128
132
  ConsolePlayer.getConsole()
129
133
  .sendMessage(
130
134
  TranslatableCaption.of("legacyconfig.legacy_config_replaced"),
131
- Template.of("value1", plotBlockArrayString(blocks)),
132
- Template.of("value2", bucket.toString())
135
+ TagResolver.builder()
136
+ .tag("value1", Tag.inserting(Component.text(plotBlockArrayString(blocks))))
137
+ .tag("value2", Tag.inserting(Component.text(bucket.toString())))
138
+ .build()
133
139
  );
134
140
  }
135
141
 
Core/src/main/java/com/plotsquared/core/util/MainUtil.java DELETED
@@ -1,82 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.core.util;
20
-
21
- /**
22
- * plot functions
23
- *
24
- * @deprecated Do not use
25
- */
26
- @Deprecated(forRemoval = true, since = "6.0.0")
27
- public class MainUtil {
28
-
29
- /**
30
- * Cache of mapping x,y,z coordinates to the chunk array<br>
31
- * - Used for efficient world generation<br>
32
- */
33
- @Deprecated(forRemoval = true, since = "6.0.0")
34
- public static short[][] x_loc;
35
- @Deprecated(forRemoval = true, since = "6.0.0")
36
- public static short[][] y_loc;
37
- @Deprecated(forRemoval = true, since = "6.0.0")
38
- public static short[][] z_loc;
39
- @Deprecated(forRemoval = true, since = "6.0.0")
40
- public static short[][][] CACHE_I = null;
41
- @Deprecated(forRemoval = true, since = "6.0.0")
42
- public static short[][][] CACHE_J = null;
43
-
44
- /**
45
- * This cache is used for world generation and just saves a bit of calculation time when checking if something is in the plot area.
46
- */
47
- @Deprecated(forRemoval = true, since = "6.0.0")
48
- public static void initCache() {
49
- if (x_loc == null) {
50
- x_loc = new short[16][4096];
51
- y_loc = new short[16][4096];
52
- z_loc = new short[16][4096];
53
- for (int i = 0; i < 16; i++) {
54
- int i4 = i << 4;
55
- for (int j = 0; j < 4096; j++) {
56
- int y = i4 + (j >> 8);
57
- int a = j - ((y & 0xF) << 8);
58
- int z1 = a >> 4;
59
- int x1 = a - (z1 << 4);
60
- x_loc[i][j] = (short) x1;
61
- y_loc[i][j] = (short) y;
62
- z_loc[i][j] = (short) z1;
63
- }
64
- }
65
- }
66
- if (CACHE_I == null) {
67
- CACHE_I = new short[256][16][16];
68
- CACHE_J = new short[256][16][16];
69
- for (int x = 0; x < 16; x++) {
70
- for (int z = 0; z < 16; z++) {
71
- for (int y = 0; y < 256; y++) {
72
- short i = (short) (y >> 4);
73
- short j = (short) ((y & 0xF) << 8 | z << 4 | x);
74
- CACHE_I[y][x][z] = i;
75
- CACHE_J[y][x][z] = j;
76
- }
77
- }
78
- }
79
- }
80
- }
81
-
82
- }
Core/src/main/java/com/plotsquared/core/util/MathMan.java CHANGED
@@ -70,135 +70,6 @@ public class MathMan {
70
70
  return result;
71
71
  }
72
72
 
73
- /**
74
- * @deprecated Unused internally. Scheduled for removal in next major release.
75
- */
76
- @Deprecated(forRemoval = true, since = "6.11.1")
77
- public static long pairInt(int x, int y) {
78
- return (((long) x) << 32) | (y & 0xffffffffL);
79
- }
80
-
81
- /**
82
- * @deprecated Unused internally. Scheduled for removal in next major release.
83
- */
84
- @Deprecated(forRemoval = true, since = "6.11.1")
85
- public static int unpairIntX(long pair) {
86
- return (int) (pair >> 32);
87
- }
88
-
89
- /**
90
- * @deprecated Unused internally. Scheduled for removal in next major release.
91
- */
92
- @Deprecated(forRemoval = true, since = "6.11.1")
93
- public static int unpairIntY(long pair) {
94
- return (int) pair;
95
- }
96
-
97
- /**
98
- * @deprecated Unused internally. Scheduled for removal in next major release.
99
- */
100
- @Deprecated(forRemoval = true, since = "6.11.1")
101
- public static byte pair16(byte x, byte y) {
102
- return (byte) (x + (y << 4));
103
- }
104
-
105
- /**
106
- * @deprecated Unused internally. Scheduled for removal in next major release.
107
- */
108
- @Deprecated(forRemoval = true, since = "6.11.1")
109
- public static byte unpair16x(byte value) {
110
- return (byte) (value & 0xF);
111
- }
112
-
113
- /**
114
- * @deprecated Unused internally. Scheduled for removal in next major release.
115
- */
116
- @Deprecated(forRemoval = true, since = "6.11.1")
117
- public static byte unpair16y(byte value) {
118
- return (byte) ((value >> 4) & 0xF);
119
- }
120
-
121
- /**
122
- * @deprecated Unused internally. Scheduled for removal in next major release.
123
- */
124
- @Deprecated(forRemoval = true, since = "6.11.1")
125
- public static long inverseRound(double val) {
126
- long round = Math.round(val);
127
- return (long) (round + Math.signum(val - round));
128
- }
129
-
130
- /**
131
- * @deprecated Unused internally. Scheduled for removal in next major release.
132
- */
133
- @Deprecated(forRemoval = true, since = "6.11.1")
134
- public static int sqrt(int x) {
135
- int xn;
136
-
137
- if (x >= 0x10000) {
138
- if (x >= 0x1000000) {
139
- if (x >= 0x10000000) {
140
- if (x >= 0x40000000) {
141
- xn = table[x >> 24] << 8;
142
- } else {
143
- xn = table[x >> 22] << 7;
144
- }
145
- } else {
146
- if (x >= 0x4000000) {
147
- xn = table[x >> 20] << 6;
148
- } else {
149
- xn = table[x >> 18] << 5;
150
- }
151
- }
152
-
153
- xn = (xn + 1 + (x / xn)) >> 1;
154
- xn = (xn + 1 + (x / xn)) >> 1;
155
- return ((xn * xn) > x) ? --xn : xn;
156
- } else {
157
- if (x >= 0x100000) {
158
- if (x >= 0x400000) {
159
- xn = table[x >> 16] << 4;
160
- } else {
161
- xn = table[x >> 14] << 3;
162
- }
163
- } else {
164
- if (x >= 0x40000) {
165
- xn = table[x >> 12] << 2;
166
- } else {
167
- xn = table[x >> 10] << 1;
168
- }
169
- }
170
-
171
- xn = (xn + 1 + (x / xn)) >> 1;
172
-
173
- return ((xn * xn) > x) ? --xn : xn;
174
- }
175
- } else {
176
- if (x >= 0x100) {
177
- if (x >= 0x1000) {
178
- if (x >= 0x4000) {
179
- xn = (table[x >> 8]) + 1;
180
- } else {
181
- xn = (table[x >> 6] >> 1) + 1;
182
- }
183
- } else {
184
- if (x >= 0x400) {
185
- xn = (table[x >> 4] >> 2) + 1;
186
- } else {
187
- xn = (table[x >> 2] >> 3) + 1;
188
- }
189
- }
190
-
191
- return ((xn * xn) > x) ? --xn : xn;
192
- } else {
193
- if (x >= 0) {
194
- return table[x] >> 4;
195
- }
196
- }
197
- }
198
- throw new IllegalArgumentException("Invalid number:" + x);
199
- }
200
-
201
-
202
73
  public static double getMean(int[] array) {
203
74
  double count = 0;
204
75
  for (int i : array) {
@@ -207,18 +78,6 @@ public class MathMan {
207
78
  return count / array.length;
208
79
  }
209
80
 
210
- /**
211
- * @deprecated Unused internally. Scheduled for removal in next major release.
212
- */
213
- @Deprecated(forRemoval = true, since = "6.11.1")
214
- public static double getMean(double[] array) {
215
- double count = 0;
216
- for (double i : array) {
217
- count += i;
218
- }
219
- return count / array.length;
220
- }
221
-
222
81
  public static int pair(short x, short y) {
223
82
  return (x << 16) | (y & 0xFFFF);
224
83
  }
@@ -227,139 +86,10 @@ public class MathMan {
227
86
  return (a & b) + (a ^ b) / 2;
228
87
  }
229
88
 
230
-
231
- /**
232
- * @deprecated Unused internally. Scheduled for removal in next major release.
233
- */
234
- @Deprecated(forRemoval = true, since = "6.11.1")
235
- public static short unpairX(int hash) {
236
- return (short) (hash >> 16);
237
- }
238
-
239
- /**
240
- * @deprecated Unused internally. Scheduled for removal in next major release.
241
- */
242
- @Deprecated(forRemoval = true, since = "6.11.1")
243
- public static short unpairY(int hash) {
244
- return (short) (hash & 0xFFFF);
245
- }
246
-
247
- /**
248
- * get the x,y,z unit vector from pitch and yaw specified
249
- *
250
- * @param yaw yaw
251
- * @param pitch pitch
252
- * @return x, y, z unit vector
253
- * @deprecated Unused internally. Scheduled for removal in next major release.
254
- */
255
- @Deprecated(forRemoval = true, since = "6.11.1")
256
- public static float[] getDirection(float yaw, float pitch) {
257
- double pitch_sin = Math.sin(pitch);
258
- return new float[]{(float) (pitch_sin * Math.cos(yaw)),
259
- (float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch)};
260
- }
261
-
262
- /**
263
- * @deprecated Unused internally. Scheduled for removal in next major release.
264
- */
265
- @Deprecated(forRemoval = true, since = "6.11.1")
266
- public static int floorMod(int x, int y) {
267
- int i = x % y;
268
- if (i < 0) {
269
- i += y;
270
- }
271
- return i;
272
- }
273
-
274
89
  public static int roundInt(double value) {
275
90
  return (int) (value < 0 ? (value == (int) value) ? value : value - 1 : value);
276
91
  }
277
92
 
278
- /**
279
- * Returns [ pitch, yaw ]
280
- *
281
- * @param x x
282
- * @param y y
283
- * @param z z
284
- * @return pitch and yaw of x,y,z from 0,0,0
285
- * @deprecated Unused internally. Scheduled for removal in next major release.
286
- */
287
- @Deprecated(forRemoval = true, since = "6.11.1")
288
- public static float[] getPitchAndYaw(float x, float y, float z) {
289
- float distance = sqrtApprox((z * z) + (x * x));
290
- return new float[]{atan2(y, distance), atan2(x, z)};
291
- }
292
-
293
- /**
294
- * @deprecated Unused internally. Scheduled for removal in next major release.
295
- */
296
- @Deprecated(forRemoval = true, since = "6.11.1")
297
- public static final float atan2(float y, float x) {
298
- float add;
299
- float mul;
300
-
301
- if (x < 0.0f) {
302
- if (y < 0.0f) {
303
- x = -x;
304
- y = -y;
305
-
306
- mul = 1.0f;
307
- } else {
308
- x = -x;
309
- mul = -1.0f;
310
- }
311
-
312
- add = -3.141592653f;
313
- } else {
314
- if (y < 0.0f) {
315
- y = -y;
316
- mul = -1.0f;
317
- } else {
318
- mul = 1.0f;
319
- }
320
-
321
- add = 0.0f;
322
- }
323
-
324
- float invDiv = 1.0f / (((x < y) ? y : x) * INV_ATAN2_DIM_MINUS_1);
325
-
326
- int xi = (int) (x * invDiv);
327
- int yi = (int) (y * invDiv);
328
-
329
- return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
330
- }
331
-
332
- /**
333
- * @deprecated Unused internally. Scheduled for removal in next major release.
334
- */
335
- @Deprecated(forRemoval = true, since = "6.11.1")
336
- public static float sqrtApprox(float f) {
337
- return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
338
- }
339
-
340
-
341
- /**
342
- * @deprecated Unused internally. Scheduled for removal in next major release.
343
- */
344
- @Deprecated(forRemoval = true, since = "6.11.1")
345
- public static double sqrtApprox(double d) {
346
- return Double
347
- .longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
348
- }
349
-
350
- /**
351
- * @deprecated Unused internally. Scheduled for removal in next major release.
352
- */
353
- @Deprecated(forRemoval = true, since = "6.11.1")
354
- public static float invSqrt(float x) {
355
- float xhalf = 0.5f * x;
356
- int i = Float.floatToIntBits(x);
357
- i = 0x5f3759df - (i >> 1);
358
- x = Float.intBitsToFloat(i);
359
- x = x * (1.5f - (xhalf * x * x));
360
- return x;
361
- }
362
-
363
93
  public static int getPositiveId(int i) {
364
94
  if (i < 0) {
365
95
  return (-i * 2) - 1;
@@ -391,18 +121,6 @@ public class MathMan {
391
121
  return true;
392
122
  }
393
123
 
394
- /**
395
- * @deprecated Unused internally. Scheduled for removal in next major release.
396
- */
397
- @Deprecated(forRemoval = true, since = "6.11.1")
398
- public static double getSD(double[] array, double av) {
399
- double sd = 0;
400
- for (double element : array) {
401
- sd += Math.pow(Math.abs(element - av), 2);
402
- }
403
- return Math.sqrt(sd / array.length);
404
- }
405
-
406
124
  public static double getSD(int[] array, double av) {
407
125
  double sd = 0;
408
126
  for (int element : array) {
@@ -411,34 +129,4 @@ public class MathMan {
411
129
  return Math.sqrt(sd / array.length);
412
130
  }
413
131
 
414
- /**
415
- * @deprecated Unused internally. Scheduled for removal in next major release.
416
- */
417
- @Deprecated(forRemoval = true, since = "6.11.1")
418
- public static int mod(int x, int y) {
419
- if (isPowerOfTwo(y)) {
420
- return x & (y - 1);
421
- }
422
- return x % y;
423
- }
424
-
425
- /**
426
- * @deprecated Unused internally. Scheduled for removal in next major release.
427
- */
428
- @Deprecated(forRemoval = true, since = "6.11.1")
429
- public static int unsignedmod(int x, int y) {
430
- if (isPowerOfTwo(y)) {
431
- return x & (y - 1);
432
- }
433
- return x % y;
434
- }
435
-
436
- /**
437
- * @deprecated Unused internally. Scheduled for removal in next major release.
438
- */
439
- @Deprecated(forRemoval = true, since = "6.11.1")
440
- public static boolean isPowerOfTwo(int number) {
441
- return (number & (number - 1)) == 0;
442
- }
443
-
444
132
  }
Core/src/main/java/com/plotsquared/core/util/PatternUtil.java CHANGED
@@ -33,7 +33,9 @@ import com.sk89q.worldedit.math.BlockVector3;
33
33
  import com.sk89q.worldedit.world.block.BaseBlock;
34
34
  import com.sk89q.worldedit.world.block.BlockState;
35
35
  import com.sk89q.worldedit.world.block.BlockType;
36
- import net.kyori.adventure.text.minimessage.Template;
36
+ import net.kyori.adventure.text.Component;
37
+ import net.kyori.adventure.text.minimessage.tag.Tag;
38
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
37
39
  import org.checkerframework.checker.nullness.qual.NonNull;
38
40
 
39
41
  import java.util.ArrayList;
@@ -83,7 +85,7 @@ public class PatternUtil {
83
85
  } catch (InputParseException e) {
84
86
  throw new Command.CommandException(
85
87
  TranslatableCaption.of("invalid.not_valid_block"),
86
- Template.of("value", e.getMessage())
88
+ TagResolver.resolver("value", Tag.inserting(Component.text(e.getMessage())))
87
89
  );
88
90
  }
89
91
  }
Core/src/main/java/com/plotsquared/core/util/Permissions.java DELETED
@@ -1,148 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.core.util;
20
-
21
- import com.plotsquared.core.configuration.Settings;
22
- import com.plotsquared.core.configuration.caption.TranslatableCaption;
23
- import com.plotsquared.core.permissions.Permission;
24
- import com.plotsquared.core.permissions.PermissionHolder;
25
- import com.plotsquared.core.player.PlotPlayer;
26
- import net.kyori.adventure.text.minimessage.Template;
27
- import org.checkerframework.checker.nullness.qual.NonNull;
28
-
29
- /**
30
- * The Permissions class handles checking user permissions.<br>
31
- * - This will respect * nodes and plots.admin and can be used to check permission ranges (e.g. plots.plot.5)<br>
32
- * - Checking the PlotPlayer class directly will not take the above into account<br>
33
- *
34
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
35
- * classes
36
- */
37
- @Deprecated(forRemoval = true, since = "6.9.3")
38
- public class Permissions {
39
-
40
- /**
41
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
42
- * classes. Use {@link PlotPlayer#hasPermission(String, boolean)}
43
- */
44
- @Deprecated(forRemoval = true, since = "6.9.3")
45
- public static boolean hasPermission(PlotPlayer<?> player, Permission permission, boolean notify) {
46
- return hasPermission(player, permission.toString(), notify);
47
- }
48
-
49
- /**
50
- * Check if the owner of the profile has a given (global) permission
51
- *
52
- * @param caller permission holder
53
- * @param permission Permission
54
- * @return {@code true} if the owner has the given permission, else {@code false}
55
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
56
- * classes. Use {@link PermissionHolder#hasPermission(Permission)}
57
- */
58
- @Deprecated(forRemoval = true, since = "6.9.3")
59
- public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull Permission permission) {
60
- return caller.hasPermission(permission.toString());
61
- }
62
-
63
- /**
64
- * Check if the owner of the profile has a given (global) permission. There is no guarantee that per-world permissions will
65
- * be checked because unmaintained crap plugins like PEX exist.
66
- *
67
- * @param caller permission holder
68
- * @param permission Permission
69
- * @return {@code true} if the owner has the given permission, else {@code false}
70
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
71
- * classes. Use {@link PermissionHolder#hasPermission(String)}
72
- */
73
- @Deprecated(forRemoval = true, since = "6.9.3")
74
- public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull String permission) {
75
- return caller.hasPermission(permission);
76
- }
77
-
78
- /**
79
- * Check if the owner of the profile has a given (global) keyed permission. Checks both {@code permission.key}
80
- * and {@code permission.*}
81
- *
82
- * @param caller permission holder
83
- * @param permission Permission
84
- * @param key Permission "key"
85
- * @return {@code true} if the owner has the given permission, else {@code false}
86
- * @since 6.0.10
87
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
88
- * classes. Use {@link PermissionHolder#hasKeyedPermission(String, String)}
89
- */
90
- @Deprecated(forRemoval = true, since = "6.9.3")
91
- public static boolean hasKeyedPermission(
92
- final @NonNull PermissionHolder caller, final @NonNull String permission,
93
- final @NonNull String key
94
- ) {
95
- return caller.hasKeyedPermission(permission, key);
96
- }
97
-
98
- /**
99
- * Checks if a PlotPlayer has a permission, and optionally send the no permission message if applicable.
100
- *
101
- * @param player permission holder
102
- * @param permission permission
103
- * @param notify if to notify the permission holder
104
- * @return if permission is had
105
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
106
- * classes. Use {@link PlotPlayer#hasPermission(String, boolean)}
107
- */
108
- @Deprecated(forRemoval = true, since = "6.9.3")
109
- public static boolean hasPermission(PlotPlayer<?> player, String permission, boolean notify) {
110
- if (!hasPermission(player, permission)) {
111
- if (notify) {
112
- player.sendMessage(
113
- TranslatableCaption.of("permission.no_permission_event"),
114
- Template.of("node", permission)
115
- );
116
- }
117
- return false;
118
- }
119
- return true;
120
- }
121
-
122
- /**
123
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
124
- * classes. Use {@link PlotPlayer#hasPermissionRange(Permission, int)}
125
- */
126
- @Deprecated(forRemoval = true, since = "6.9.3")
127
- public static int hasPermissionRange(PlotPlayer<?> player, Permission Permission, int range) {
128
- return hasPermissionRange(player, Permission.toString(), range);
129
- }
130
-
131
- /**
132
- * Check the highest permission a PlotPlayer has within a specified range.<br>
133
- * - Excessively high values will lag<br>
134
- * - The default range that is checked is {@link Settings.Limit#MAX_PLOTS}<br>
135
- *
136
- * @param player Player to check for
137
- * @param stub The permission stub to check e.g. for `plots.plot.#` the stub is `plots.plot`
138
- * @param range The range to check
139
- * @return The highest permission they have within that range
140
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
141
- * classes. Use {@link PlotPlayer#hasPermissionRange(String, int)}
142
- */
143
- @Deprecated(forRemoval = true, since = "6.9.3")
144
- public static int hasPermissionRange(PlotPlayer<?> player, String stub, int range) {
145
- return player.hasPermissionRange(stub, range);
146
- }
147
-
148
- }
Core/src/main/java/com/plotsquared/core/util/PlayerManager.java CHANGED
@@ -30,9 +30,11 @@ import com.plotsquared.core.player.OfflinePlotPlayer;
30
30
  import com.plotsquared.core.player.PlotPlayer;
31
31
  import com.plotsquared.core.uuid.UUIDMapping;
32
32
  import net.kyori.adventure.text.Component;
33
+ import net.kyori.adventure.text.ComponentLike;
33
34
  import net.kyori.adventure.text.TextComponent;
34
35
  import net.kyori.adventure.text.minimessage.MiniMessage;
35
- import net.kyori.adventure.text.minimessage.Template;
36
+ import net.kyori.adventure.text.minimessage.tag.Tag;
37
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
36
38
  import org.checkerframework.checker.nullness.qual.NonNull;
37
39
  import org.checkerframework.checker.nullness.qual.Nullable;
38
40
 
@@ -96,7 +98,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
96
98
  consumer.accept(null, throwable);
97
99
  } else {
98
100
  for (final UUIDMapping uuid : uuids) {
99
- result.add(uuid.getUuid());
101
+ result.add(uuid.uuid());
100
102
  }
101
103
  consumer.accept(result, null);
102
104
  }
@@ -114,18 +116,18 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
114
116
  */
115
117
  public static @NonNull Component getPlayerList(final @NonNull Collection<UUID> uuids, LocaleHolder localeHolder) {
116
118
  if (uuids.isEmpty()) {
117
- return MINI_MESSAGE.parse(TranslatableCaption.of("info.none").getComponent(localeHolder));
119
+ return TranslatableCaption.of("info.none").toComponent(localeHolder).asComponent();
118
120
  }
119
121
 
120
122
  final List<UUID> players = new LinkedList<>();
121
- final List<String> users = new LinkedList<>();
123
+ final List<ComponentLike> users = new LinkedList<>();
122
124
  for (final UUID uuid : uuids) {
123
125
  if (uuid == null) {
124
- users.add(MINI_MESSAGE.stripTokens(TranslatableCaption.of("info.none").getComponent(localeHolder)));
126
+ users.add(TranslatableCaption.of("info.none").toComponent(localeHolder));
125
127
  } else if (DBFunc.EVERYONE.equals(uuid)) {
126
- users.add(MINI_MESSAGE.stripTokens(TranslatableCaption.of("info.everyone").getComponent(localeHolder)));
128
+ users.add(TranslatableCaption.of("info.everyone").toComponent(localeHolder));
127
129
  } else if (DBFunc.SERVER.equals(uuid)) {
128
- users.add(MINI_MESSAGE.stripTokens(TranslatableCaption.of("info.console").getComponent(localeHolder)));
130
+ users.add(TranslatableCaption.of("info.console").toComponent(localeHolder));
129
131
  } else {
130
132
  players.add(uuid);
131
133
  }
@@ -134,7 +136,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
134
136
  try {
135
137
  for (final UUIDMapping mapping : PlotSquared.get().getImpromptuUUIDPipeline()
136
138
  .getNames(players).get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS)) {
137
- users.add(mapping.getUsername());
139
+ users.add(Component.text(mapping.username()));
138
140
  }
139
141
  } catch (final Exception e) {
140
142
  e.printStackTrace();
@@ -144,64 +146,20 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
144
146
  TextComponent.Builder list = Component.text();
145
147
  for (int x = 0; x < users.size(); x++) {
146
148
  if (x + 1 == uuids.size()) {
147
- list.append(MINI_MESSAGE.parse(c, Template.of("user", users.get(x))));
149
+ list.append(MINI_MESSAGE.deserialize(c, TagResolver.resolver(
150
+ "user",
151
+ Tag.inserting(users.get(x))
152
+ )));
148
153
  } else {
149
- list.append(MINI_MESSAGE.parse(c + ", ", Template.of("user", users.get(x))));
154
+ list.append(MINI_MESSAGE.deserialize(c + ", ", TagResolver.resolver(
155
+ "user",
156
+ Tag.inserting(users.get(x))
157
+ )));
150
158
  }
151
159
  }
152
160
  return list.asComponent();
153
161
  }
154
162
 
155
- /**
156
- * Get the name from a UUID.
157
- *
158
- * @param owner Owner UUID
159
- * @return The player's name, None, Everyone or Unknown
160
- * @deprecated Use {@link #resolveName(UUID)}
161
- */
162
- @Deprecated(forRemoval = true, since = "6.4.0")
163
- public static @NonNull String getName(final @Nullable UUID owner) {
164
- return getName(owner, true);
165
- }
166
-
167
- /**
168
- * Get the name from a UUID.
169
- *
170
- * @param owner Owner UUID
171
- * @param blocking Whether or not the operation can be blocking
172
- * @return The player's name, None, Everyone or Unknown
173
- * @deprecated Use {@link #resolveName(UUID, boolean)}
174
- */
175
- @Deprecated(forRemoval = true, since = "6.4.0")
176
- public static @NonNull String getName(final @Nullable UUID owner, final boolean blocking) {
177
- if (owner == null) {
178
- TranslatableCaption.of("info.none");
179
- }
180
- if (owner.equals(DBFunc.EVERYONE)) {
181
- TranslatableCaption.of("info.everyone");
182
- }
183
- if (owner.equals(DBFunc.SERVER)) {
184
- TranslatableCaption.of("info.server");
185
- }
186
- final String name;
187
- if (blocking) {
188
- name = PlotSquared.get().getImpromptuUUIDPipeline()
189
- .getSingle(owner, Settings.UUID.BLOCKING_TIMEOUT);
190
- } else {
191
- final UUIDMapping uuidMapping =
192
- PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(owner);
193
- if (uuidMapping != null) {
194
- name = uuidMapping.getUsername();
195
- } else {
196
- name = null;
197
- }
198
- }
199
- if (name == null) {
200
- TranslatableCaption.of("info.unknown");
201
- }
202
- return name;
203
- }
204
-
205
163
  /**
206
164
  * Attempts to resolve the username by an uuid
207
165
  * <p>
@@ -242,7 +200,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
242
200
  final UUIDMapping uuidMapping =
243
201
  PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(owner);
244
202
  if (uuidMapping != null) {
245
- name = uuidMapping.getUsername();
203
+ name = uuidMapping.username();
246
204
  } else {
247
205
  name = null;
248
206
  }
Core/src/main/java/com/plotsquared/core/util/RegExUtil.java DELETED
@@ -1,34 +0,0 @@
1
- /*
2
- * PlotSquared, a land and world management plugin for Minecraft.
3
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
4
- * Copyright (C) IntellectualSites team and contributors
5
- *
6
- * This program is free software: you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation, either version 3 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
18
- */
19
- package com.plotsquared.core.util;
20
-
21
- import java.util.HashMap;
22
- import java.util.Map;
23
- import java.util.regex.Pattern;
24
-
25
- @Deprecated(since = "6.6.2", forRemoval = true)
26
- public class RegExUtil {
27
-
28
- public static Map<String, Pattern> compiledPatterns;
29
-
30
- static {
31
- compiledPatterns = new HashMap<>();
32
- }
33
-
34
- }
Core/src/main/java/com/plotsquared/core/util/RegionManager.java CHANGED
@@ -272,7 +272,8 @@ public abstract class RegionManager {
272
272
  fromQueue1.addReadChunks(new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()).getChunks());
273
273
  fromQueue2.addReadChunks(new CuboidRegion(
274
274
  swapPos.getBlockVector3(),
275
- BlockVector3.at(swapPos.getX() + pos2.getX() - pos1.getX(),
275
+ BlockVector3.at(
276
+ swapPos.getX() + pos2.getX() - pos1.getX(),
276
277
  pos1.getY(),
277
278
  swapPos.getZ() + pos2.getZ() - pos1.getZ()
278
279
  )
@@ -372,17 +373,6 @@ public abstract class RegionManager {
372
373
  });
373
374
  }
374
375
 
375
- @Deprecated(forRemoval = true, since = "6.6.0")
376
- public void setBiome(
377
- final CuboidRegion region,
378
- final int extendBiome,
379
- final BiomeType biome,
380
- final String world,
381
- final Runnable whenDone
382
- ) {
383
- setBiome(region, extendBiome, biome, PlotSquared.get().getPlotAreaManager().getPlotAreas(world, region)[0], whenDone);
384
- }
385
-
386
376
  /**
387
377
  * Set a region to a biome type.
388
378
  *
Core/src/main/java/com/plotsquared/core/util/RegionUtil.java CHANGED
@@ -19,12 +19,10 @@
19
19
  package com.plotsquared.core.util;
20
20
 
21
21
  import com.plotsquared.core.location.Location;
22
- import com.sk89q.worldedit.math.BlockVector2;
23
22
  import com.sk89q.worldedit.math.BlockVector3;
24
23
  import com.sk89q.worldedit.regions.CuboidRegion;
25
24
  import org.checkerframework.checker.nullness.qual.NonNull;
26
25
 
27
- import java.awt.geom.Rectangle2D;
28
26
  import java.util.Collection;
29
27
  import java.util.Iterator;
30
28
 
@@ -68,11 +66,6 @@ public class RegionUtil {
68
66
  return new CuboidRegion(min, max);
69
67
  }
70
68
 
71
- @Deprecated(forRemoval = true, since = "6.6.0")
72
- public static CuboidRegion createRegion(int pos1x, int pos2x, int pos1z, int pos2z) {
73
- return createRegion(pos1x, pos2x, 0, 255, pos1z, pos2z);
74
- }
75
-
76
69
  public static CuboidRegion createRegion(
77
70
  int pos1x, int pos2x, int pos1y, int pos2y, int pos1z,
78
71
  int pos2z
@@ -95,16 +88,6 @@ public class RegionUtil {
95
88
  .getY() && y <= max.getY();
96
89
  }
97
90
 
98
- /**
99
- * @deprecated Unused internally. Scheduled for removal in next major release.
100
- */
101
- @Deprecated(forRemoval = true, since = "6.11.1")
102
- public static @NonNull Rectangle2D toRectangle(final @NonNull CuboidRegion region) {
103
- final BlockVector2 min = region.getMinimumPoint().toBlockVector2();
104
- final BlockVector2 max = region.getMaximumPoint().toBlockVector2();
105
- return new Rectangle2D.Double(min.getX(), min.getZ(), max.getX(), max.getZ());
106
- }
107
-
108
91
  // Because WorldEdit (not FastAsyncWorldEdit) lack this for CuboidRegion
109
92
  public static boolean intersects(CuboidRegion region, CuboidRegion other) {
110
93
  BlockVector3 regionMin = region.getMinimumPoint();
Core/src/main/java/com/plotsquared/core/util/StringMan.java CHANGED
@@ -18,19 +18,13 @@
18
18
  */
19
19
  package com.plotsquared.core.util;
20
20
 
21
- import com.plotsquared.core.PlotSquared;
22
- import com.plotsquared.core.configuration.caption.Caption;
23
21
  import org.checkerframework.checker.nullness.qual.NonNull;
24
22
 
25
- import java.lang.reflect.Array;
26
23
  import java.util.ArrayList;
27
24
  import java.util.Arrays;
28
25
  import java.util.Collection;
29
26
  import java.util.Comparator;
30
- import java.util.Iterator;
31
27
  import java.util.List;
32
- import java.util.Map;
33
- import java.util.Map.Entry;
34
28
  import java.util.Set;
35
29
  import java.util.regex.Pattern;
36
30
 
@@ -39,31 +33,6 @@ public class StringMan {
39
33
  // Stolen from https://stackoverflow.com/a/366532/12620913 | Debug: https://regex101.com/r/DudJLb/1
40
34
  private static final Pattern STRING_SPLIT_PATTERN = Pattern.compile("[^\\s\"]+|\"([^\"]*)\"");
41
35
 
42
- /**
43
- * @deprecated Unused internally. Scheduled for removal in next major release.
44
- */
45
- @Deprecated(forRemoval = true, since = "6.11.1")
46
- public static String replaceFromMap(String string, Map<String, String> replacements) {
47
- StringBuilder sb = new StringBuilder(string);
48
- int size = string.length();
49
- for (Entry<String, String> entry : replacements.entrySet()) {
50
- if (size == 0) {
51
- break;
52
- }
53
- String key = entry.getKey();
54
- String value = entry.getValue();
55
- int start = sb.indexOf(key, 0);
56
- while (start > -1) {
57
- int end = start + key.length();
58
- int nextSearchStart = start + value.length();
59
- sb.replace(start, end, value);
60
- size -= end - start;
61
- start = sb.indexOf(key, nextSearchStart);
62
- }
63
- }
64
- return sb.toString();
65
- }
66
-
67
36
  public static int intersection(Set<String> options, String[] toCheck) {
68
37
  int count = 0;
69
38
  for (String check : toCheck) {
@@ -74,107 +43,6 @@ public class StringMan {
74
43
  return count;
75
44
  }
76
45
 
77
- /**
78
- * @deprecated Unused internally. Scheduled for removal in next major release.
79
- */
80
- @Deprecated(forRemoval = true, since = "6.11.1")
81
- public static String getString(Object obj) {
82
- if (obj == null) {
83
- return "null";
84
- }
85
- if (obj instanceof String) {
86
- return (String) obj;
87
- }
88
- if (obj instanceof Caption) {
89
- return ((Caption) obj).getComponent(PlotSquared.platform());
90
- }
91
- if (obj.getClass().isArray()) {
92
- StringBuilder result = new StringBuilder();
93
- String prefix = "";
94
-
95
- for (int i = 0; i < Array.getLength(obj); i++) {
96
- result.append(prefix).append(getString(Array.get(obj, i)));
97
- prefix = ",";
98
- }
99
- return "( " + result + " )";
100
- } else if (obj instanceof Collection<?>) {
101
- StringBuilder result = new StringBuilder();
102
- String prefix = "";
103
- for (Object element : (Collection<?>) obj) {
104
- result.append(prefix).append(getString(element));
105
- prefix = ",";
106
- }
107
- return "[ " + result + " ]";
108
- } else {
109
- return obj.toString();
110
- }
111
- }
112
-
113
- /**
114
- * @deprecated Unused internally. Scheduled for removal in next major release.
115
- */
116
- @Deprecated(forRemoval = true, since = "6.11.1")
117
- public static String replaceFirst(char c, String s) {
118
- if (s == null) {
119
- return "";
120
- }
121
- if (s.isEmpty()) {
122
- return s;
123
- }
124
- char[] chars = s.toCharArray();
125
- char[] newChars = new char[chars.length];
126
- int used = 0;
127
- boolean found = false;
128
- for (char cc : chars) {
129
- if (!found && (c == cc)) {
130
- found = true;
131
- } else {
132
- newChars[used++] = cc;
133
- }
134
- }
135
- if (found) {
136
- chars = new char[newChars.length - 1];
137
- System.arraycopy(newChars, 0, chars, 0, chars.length);
138
- return String.valueOf(chars);
139
- }
140
- return s;
141
- }
142
-
143
- /**
144
- * @deprecated Unused internally. Scheduled for removal in next major release.
145
- */
146
- @Deprecated(forRemoval = true, since = "6.11.1")
147
- public static String replaceAll(String string, Object... pairs) {
148
- StringBuilder sb = new StringBuilder(string);
149
- for (int i = 0; i < pairs.length; i += 2) {
150
- String key = pairs[i] + "";
151
- String value = pairs[i + 1] + "";
152
- int start = sb.indexOf(key, 0);
153
- while (start > -1) {
154
- int end = start + key.length();
155
- int nextSearchStart = start + value.length();
156
- sb.replace(start, end, value);
157
- start = sb.indexOf(key, nextSearchStart);
158
- }
159
- }
160
- return sb.toString();
161
- }
162
-
163
- /**
164
- * @deprecated Unused internally. Scheduled for removal in next major release.
165
- */
166
- @Deprecated(forRemoval = true, since = "6.11.1")
167
- public static boolean isAlphanumeric(String str) {
168
- for (int i = 0; i < str.length(); i++) {
169
- char c = str.charAt(i);
170
- if ((c < 0x30) || ((c >= 0x3a) && (c <= 0x40)) || ((c > 0x5a) && (c <= 0x60)) || (c
171
- > 0x7a)) {
172
- return false;
173
- }
174
- }
175
- return true;
176
- }
177
-
178
46
  public static boolean isAlphanumericUnd(String str) {
179
47
  for (int i = 0; i < str.length(); i++) {
180
48
  char c = str.charAt(i);
@@ -185,20 +53,6 @@ public class StringMan {
185
53
  return true;
186
54
  }
187
55
 
188
- /**
189
- * @deprecated Unused internally. Scheduled for removal in next major release.
190
- */
191
- @Deprecated(forRemoval = true, since = "6.11.1")
192
- public static boolean isAlpha(String str) {
193
- for (int i = 0; i < str.length(); i++) {
194
- char c = str.charAt(i);
195
- if ((c <= 0x40) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a)) {
196
- return false;
197
- }
198
- }
199
- return true;
200
- }
201
-
202
56
  public static String join(Collection<?> collection, String delimiter) {
203
57
  return join(collection.toArray(), delimiter);
204
58
  }
@@ -209,35 +63,6 @@ public class StringMan {
209
63
  return join(array, delimiter);
210
64
  }
211
65
 
212
- /**
213
- * @deprecated Unused internally. Scheduled for removal in next major release.
214
- */
215
- @Deprecated(forRemoval = true, since = "6.11.1")
216
- public static String join(Collection<?> collection, char delimiter) {
217
- return join(collection.toArray(), delimiter + "");
218
- }
219
-
220
- /**
221
- * @deprecated Unused internally. Scheduled for removal in next major release.
222
- */
223
- @Deprecated(forRemoval = true, since = "6.11.1")
224
- public static boolean isAsciiPrintable(char c) {
225
- return (c >= ' ') && (c < '');
226
- }
227
-
228
- /**
229
- * @deprecated Unused internally. Scheduled for removal in next major release.
230
- */
231
- @Deprecated(forRemoval = true, since = "6.11.1")
232
- public static boolean isAsciiPrintable(String s) {
233
- for (char c : s.toCharArray()) {
234
- if (!isAsciiPrintable(c)) {
235
- return false;
236
- }
237
- }
238
- return true;
239
- }
240
-
241
66
  public static int getLevenshteinDistance(String s, String t) {
242
67
  int n = s.length();
243
68
  int m = t.length();
@@ -285,31 +110,6 @@ public class StringMan {
285
110
  return result.toString();
286
111
  }
287
112
 
288
- /**
289
- * @deprecated Unused internally. Scheduled for removal in next major release.
290
- */
291
- @Deprecated(forRemoval = true, since = "6.11.1")
292
- public static String join(int[] array, String delimiter) {
293
- Integer[] wrapped = new Integer[array.length];
294
- for (int i = 0; i < array.length; i++) {
295
- wrapped[i] = array[i];
296
- }
297
- return join(wrapped, delimiter);
298
- }
299
-
300
- /**
301
- * @deprecated Unused internally. Scheduled for removal in next major release.
302
- */
303
- @Deprecated(forRemoval = true, since = "6.11.1")
304
- public static boolean isEqualToAny(String a, String... args) {
305
- for (String arg : args) {
306
- if (StringMan.isEqual(a, arg)) {
307
- return true;
308
- }
309
- }
310
- return false;
311
- }
312
-
313
113
  public static boolean isEqualIgnoreCaseToAny(@NonNull String a, String... args) {
314
114
  for (String arg : args) {
315
115
  if (a.equalsIgnoreCase(arg)) {
@@ -328,53 +128,12 @@ public class StringMan {
328
128
  return a.equals(b);
329
129
  }
330
130
 
331
- /**
332
- * @deprecated Unused internally. Scheduled for removal in next major release.
333
- */
334
- @Deprecated(forRemoval = true, since = "6.11.1")
335
- public static boolean isEqualIgnoreCase(String a, String b) {
336
- return a.equals(b) || ((a != null) && (b != null) && (a.length() == b.length()) && a
337
- .equalsIgnoreCase(b));
338
- }
339
-
340
131
  public static String repeat(String s, int n) {
341
132
  StringBuilder sb = new StringBuilder();
342
133
  sb.append(String.valueOf(s).repeat(Math.max(0, n)));
343
134
  return sb.toString();
344
135
  }
345
136
 
346
- /**
347
- * @deprecated Unused internally. Scheduled for removal in next major release.
348
- */
349
- @Deprecated(forRemoval = true, since = "6.11.1")
350
- public static boolean contains(String name, char c) {
351
- for (char current : name.toCharArray()) {
352
- if (c == current) {
353
- return true;
354
- }
355
- }
356
- return false;
357
- }
358
-
359
- /**
360
- * @deprecated Unused internally. Scheduled for removal in next major release.
361
- */
362
- @Deprecated(forRemoval = true, since = "6.11.1")
363
- public <T> Collection<T> match(Collection<T> col, String startsWith) {
364
- if (col == null) {
365
- return null;
366
- }
367
- startsWith = startsWith.toLowerCase();
368
- Iterator<?> iterator = col.iterator();
369
- while (iterator.hasNext()) {
370
- Object item = iterator.next();
371
- if (item == null || !item.toString().toLowerCase().startsWith(startsWith)) {
372
- iterator.remove();
373
- }
374
- }
375
- return col;
376
- }
377
-
378
137
  /**
379
138
  * @param message an input string
380
139
  * @return a list of strings
Core/src/main/java/com/plotsquared/core/util/TabCompletions.java CHANGED
@@ -25,7 +25,6 @@ import com.plotsquared.core.command.Command;
25
25
  import com.plotsquared.core.command.CommandCategory;
26
26
  import com.plotsquared.core.command.RequiredType;
27
27
  import com.plotsquared.core.configuration.Settings;
28
- import com.plotsquared.core.player.ConsolePlayer;
29
28
  import com.plotsquared.core.player.PlotPlayer;
30
29
  import com.plotsquared.core.plot.Plot;
31
30
  import com.plotsquared.core.plot.PlotArea;
@@ -67,23 +66,6 @@ public final class TabCompletions {
67
66
  "This is a utility class and cannot be instantiated");
68
67
  }
69
68
 
70
- /**
71
- * Get a list of tab completions corresponding to player names. This uses the UUID pipeline
72
- * cache, so it will complete will all names known to PlotSquared
73
- *
74
- * @param input Command input
75
- * @param existing Players that should not be included in completions
76
- * @return List of completions
77
- * @deprecated In favor {@link #completePlayers(PlotPlayer, String, List)}
78
- */
79
- @Deprecated(forRemoval = true, since = "6.1.3")
80
- public static @NonNull List<Command> completePlayers(
81
- final @NonNull String input,
82
- final @NonNull List<String> existing
83
- ) {
84
- return completePlayers(ConsolePlayer.getConsole(), input, existing);
85
- }
86
-
87
69
  /**
88
70
  * Get a list of tab completions corresponding to player names. This uses the UUID pipeline
89
71
  * cache, so it will complete will all names known to PlotSquared
@@ -102,24 +84,6 @@ public final class TabCompletions {
102
84
  return completePlayers("players", issuer, input, existing, uuid -> true);
103
85
  }
104
86
 
105
- /**
106
- * Get a list of tab completions corresponding to player names added to the given plot.
107
- *
108
- * @param plot Plot to complete added players for
109
- * @param input Command input
110
- * @param existing Players that should not be included in completions
111
- * @return List of completions
112
- *
113
- * @deprecated In favor {@link #completeAddedPlayers(PlotPlayer, Plot, String, List)}
114
- */
115
- @Deprecated(forRemoval = true, since = "6.1.3")
116
- public static @NonNull List<Command> completeAddedPlayers(
117
- final @NonNull Plot plot,
118
- final @NonNull String input, final @NonNull List<String> existing
119
- ) {
120
- return completeAddedPlayers(ConsolePlayer.getConsole(), plot, input, existing);
121
- }
122
-
123
87
  /**
124
88
  * Get a list of tab completions corresponding to player names added to the given plot.
125
89
  *
@@ -251,24 +215,6 @@ public final class TabCompletions {
251
215
  return Collections.unmodifiableList(completions);
252
216
  }
253
217
 
254
- /**
255
- * @param cacheIdentifier Cache key
256
- * @param input Command input
257
- * @param existing Players that should not be included in completions
258
- * @param uuidFilter Filter applied before caching values
259
- * @return List of completions
260
- * @deprecated In favor {@link #completePlayers(String, PlotPlayer, String, List, Predicate)}
261
- */
262
- @SuppressWarnings("unused")
263
- @Deprecated(forRemoval = true, since = "6.1.3")
264
- private static List<Command> completePlayers(
265
- final @NonNull String cacheIdentifier,
266
- final @NonNull String input, final @NonNull List<String> existing,
267
- final @NonNull Predicate<UUID> uuidFilter
268
- ) {
269
- return completePlayers(cacheIdentifier, ConsolePlayer.getConsole(), input, existing, uuidFilter);
270
- }
271
-
272
218
  /**
273
219
  * @param cacheIdentifier Cache key
274
220
  * @param issuer The player who issued the tab completion
@@ -292,8 +238,8 @@ public final class TabCompletions {
292
238
  PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
293
239
  players = new ArrayList<>(mappings.size());
294
240
  for (final UUIDMapping mapping : mappings) {
295
- if (uuidFilter.test(mapping.getUuid())) {
296
- players.add(mapping.getUsername());
241
+ if (uuidFilter.test(mapping.uuid())) {
242
+ players.add(mapping.username());
297
243
  }
298
244
  }
299
245
  cachedCompletionValues.put(cacheIdentifier, players);
Core/src/main/java/com/plotsquared/core/util/WEManager.java CHANGED
@@ -58,37 +58,6 @@ public class WEManager {
58
58
  return false;
59
59
  }
60
60
 
61
- /**
62
- * @deprecated Unused internally. Scheduled for removal in next major release.
63
- */
64
- @Deprecated(forRemoval = true, since = "6.11.1")
65
- public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dy, double dz) {
66
- int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
67
- int y = Math.toIntExact(Math.round(dy - 0.5));
68
- int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
69
- for (CuboidRegion region : mask) {
70
- if (RegionUtil.contains(region, x, y, z)) {
71
- return true;
72
- }
73
- }
74
- return false;
75
- }
76
-
77
- /**
78
- * @deprecated Unused internally. Scheduled for removal in next major release.
79
- */
80
- @Deprecated(forRemoval = true, since = "6.11.1")
81
- public static boolean maskContains(Set<CuboidRegion> mask, double dx, double dz) {
82
- int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
83
- int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
84
- for (CuboidRegion region : mask) {
85
- if (RegionUtil.contains(region, x, z)) {
86
- return true;
87
- }
88
- }
89
- return false;
90
- }
91
-
92
61
  public static HashSet<CuboidRegion> getMask(PlotPlayer<?> player) {
93
62
  HashSet<CuboidRegion> regions = new HashSet<>();
94
63
  UUID uuid = player.getUUID();
@@ -124,25 +93,4 @@ public class WEManager {
124
93
  return regions;
125
94
  }
126
95
 
127
- /**
128
- * @deprecated Unused internally. Scheduled for removal in next major release.
129
- */
130
- @Deprecated(forRemoval = true, since = "6.11.1")
131
- public static boolean intersects(CuboidRegion region1, CuboidRegion region2) {
132
- return RegionUtil.intersects(region1, region2);
133
- }
134
-
135
- /**
136
- * @deprecated Unused internally. Scheduled for removal in next major release.
137
- */
138
- @Deprecated(forRemoval = true, since = "6.11.1")
139
- public static boolean regionContains(CuboidRegion selection, HashSet<CuboidRegion> mask) {
140
- for (CuboidRegion region : mask) {
141
- if (intersects(region, selection)) {
142
- return true;
143
- }
144
- }
145
- return false;
146
- }
147
-
148
96
  }
Core/src/main/java/com/plotsquared/core/util/WorldUtil.java CHANGED
@@ -30,14 +30,13 @@ import com.sk89q.jnbt.NBTInputStream;
30
30
  import com.sk89q.jnbt.NBTOutputStream;
31
31
  import com.sk89q.jnbt.Tag;
32
32
  import com.sk89q.worldedit.math.BlockVector2;
33
- import com.sk89q.worldedit.math.BlockVector3;
34
33
  import com.sk89q.worldedit.regions.CuboidRegion;
35
34
  import com.sk89q.worldedit.world.World;
36
35
  import com.sk89q.worldedit.world.biome.BiomeType;
37
36
  import com.sk89q.worldedit.world.block.BlockState;
38
37
  import com.sk89q.worldedit.world.block.BlockType;
39
38
  import com.sk89q.worldedit.world.entity.EntityType;
40
- import net.kyori.adventure.text.minimessage.Template;
39
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
41
40
  import org.checkerframework.checker.index.qual.NonNegative;
42
41
  import org.checkerframework.checker.nullness.qual.NonNull;
43
42
  import org.checkerframework.checker.nullness.qual.Nullable;
@@ -63,26 +62,6 @@ import java.util.zip.ZipOutputStream;
63
62
 
64
63
  public abstract class WorldUtil {
65
64
 
66
- /**
67
- * Set the biome in a region
68
- *
69
- * @param world World name
70
- * @param p1x Min X
71
- * @param p1z Min Z
72
- * @param p2x Max X
73
- * @param p2z Max Z
74
- * @param biome Biome
75
- * @deprecated use {@link WorldUtil#setBiome(String, CuboidRegion, BiomeType)}
76
- */
77
- @Deprecated(forRemoval = true)
78
- public static void setBiome(String world, int p1x, int p1z, int p2x, int p2z, BiomeType biome) {
79
- World weWorld = PlotSquared.platform().worldUtil().getWeWorld(world);
80
- BlockVector3 pos1 = BlockVector2.at(p1x, p1z).toBlockVector3(weWorld.getMinY());
81
- BlockVector3 pos2 = BlockVector2.at(p2x, p2z).toBlockVector3(weWorld.getMaxY());
82
- CuboidRegion region = new CuboidRegion(pos1, pos2);
83
- PlotSquared.platform().worldUtil().setBiomes(world, region, biome);
84
- }
85
-
86
65
  /**
87
66
  * Set the biome in a region
88
67
  *
@@ -155,7 +134,7 @@ public abstract class WorldUtil {
155
134
  public abstract void setSign(
156
135
  @NonNull Location location,
157
136
  @NonNull Caption[] lines,
158
- @NonNull Template... replacements
137
+ @NonNull TagResolver... replacements
159
138
  );
160
139
 
161
140
  /**
@@ -306,7 +285,8 @@ public abstract class WorldUtil {
306
285
  int trz = top.getZ() >> 9;
307
286
  Set<BlockVector2> files = getChunkChunks(bot.getWorldName());
308
287
  for (BlockVector2 mca : files) {
309
- if (mca.getX() >= brx && mca.getX() <= trx && mca.getZ() >= brz && mca.getZ() <= trz && !added.contains(mca)) {
288
+ if (mca.getX() >= brx && mca.getX() <= trx && mca.getZ() >= brz && mca.getZ() <= trz && !added.contains(
289
+ mca)) {
310
290
  final File file = getMcr(plot.getWorldName(), mca.getX(), mca.getZ());
311
291
  if (file != null) {
312
292
  //final String name = "r." + (x - cx) + "." + (z - cz) + ".mca";
Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java CHANGED
@@ -20,33 +20,35 @@ package com.plotsquared.core.util.helpmenu;
20
20
 
21
21
  import com.plotsquared.core.command.Argument;
22
22
  import com.plotsquared.core.command.Command;
23
- import com.plotsquared.core.configuration.caption.Templates;
24
23
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
25
24
  import com.plotsquared.core.player.PlotPlayer;
26
25
  import com.plotsquared.core.util.StringMan;
26
+ import net.kyori.adventure.text.Component;
27
+ import net.kyori.adventure.text.ComponentLike;
27
28
  import net.kyori.adventure.text.minimessage.MiniMessage;
28
- import net.kyori.adventure.text.minimessage.Template;
29
+ import net.kyori.adventure.text.minimessage.tag.Tag;
30
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
31
+ import org.jetbrains.annotations.NotNull;
29
32
 
30
- public class HelpObject {
33
+ public class HelpObject implements ComponentLike {
31
34
 
32
- static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
35
+ static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
33
36
 
34
- private final String rendered;
37
+ private final Component rendered;
35
38
 
36
39
  public HelpObject(final Command command, final String label, final PlotPlayer<?> audience) {
37
- rendered = MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
40
+ rendered = MINI_MESSAGE.deserialize(
38
41
  TranslatableCaption.of("help.help_item").getComponent(audience),
39
- Template.of("usage", command.getUsage().replace("{label}", label)),
40
- Template.of("alias", command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")),
41
- Templates.of(audience, "desc", command.getDescription()),
42
- Template.of("arguments", buildArgumentList(command.getRequiredArguments())),
43
- Template.of("label", label)
44
- ));
45
- }
46
-
47
- @Override
48
- public String toString() {
49
- return rendered;
42
+ TagResolver.builder()
43
+ .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label))))
44
+ .tag("alias", Tag.inserting(Component.text(
45
+ command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")
46
+ )))
47
+ .tag("desc", Tag.inserting(command.getDescription().toComponent(audience)))
48
+ .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments()))))
49
+ .tag("label", Tag.inserting(Component.text(label)))
50
+ .build()
51
+ );
50
52
  }
51
53
 
52
54
  private String buildArgumentList(final Argument<?>[] arguments) {
@@ -61,4 +63,9 @@ public class HelpObject {
61
63
  return arguments.length > 0 ? builder.substring(0, builder.length() - 1) : "";
62
64
  }
63
65
 
66
+ @Override
67
+ public @NotNull Component asComponent() {
68
+ return this.rendered;
69
+ }
70
+
64
71
  }
Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpPage.java CHANGED
@@ -22,50 +22,46 @@ import com.plotsquared.core.command.CommandCategory;
22
22
  import com.plotsquared.core.configuration.caption.StaticCaption;
23
23
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
24
24
  import com.plotsquared.core.player.PlotPlayer;
25
- import com.plotsquared.core.util.StringMan;
25
+ import com.plotsquared.core.util.ComponentHelper;
26
+ import net.kyori.adventure.text.Component;
26
27
  import net.kyori.adventure.text.minimessage.MiniMessage;
27
- import net.kyori.adventure.text.minimessage.Template;
28
+ import net.kyori.adventure.text.minimessage.tag.Tag;
29
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
28
30
 
29
31
  import java.util.ArrayList;
30
32
  import java.util.List;
31
33
 
32
34
  public class HelpPage {
33
35
 
34
- private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
36
+ private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
35
37
  private final List<HelpObject> helpObjects;
36
- private final Template catTemplate;
37
- private final Template curTemplate;
38
- private final Template maxTemplate;
38
+ private final TagResolver pageHeaderResolver;
39
39
 
40
40
  public HelpPage(CommandCategory category, int currentPage, int maxPages) {
41
41
  this.helpObjects = new ArrayList<>();
42
- this.catTemplate = Template.of("category", category == null ? "ALL" : category.name());
43
- this.curTemplate = Template.of("current", String.valueOf(currentPage + 1));
44
- this.maxTemplate = Template.of("max", String.valueOf(maxPages + 1));
42
+ this.pageHeaderResolver = TagResolver.builder()
43
+ .tag("category", Tag.inserting(Component.text(category == null ? "ALL" : category.name())))
44
+ .tag("current", Tag.inserting(Component.text(currentPage + 1)))
45
+ .tag("max", Tag.inserting(Component.text(maxPages + 1)))
46
+ .build();
45
47
  }
46
48
 
47
49
  public void render(PlotPlayer<?> player) {
48
50
  if (this.helpObjects.size() < 1) {
49
51
  player.sendMessage(TranslatableCaption.of("help.no_permission"));
50
52
  } else {
51
- Template header = Template.of("header", TranslatableCaption.of("help.help_header").getComponent(player));
52
- Template page_header = Template.of(
53
- "page_header",
54
- MINI_MESSAGE.parse(
53
+ TagResolver contentResolver = TagResolver.builder()
54
+ .tag("header", Tag.inserting(TranslatableCaption.of("help.help_header").toComponent(player)))
55
+ .tag("page_header", Tag.inserting(MINI_MESSAGE.deserialize(
55
56
  TranslatableCaption.of("help.help_page_header").getComponent(player),
56
- catTemplate,
57
- curTemplate,
58
- maxTemplate
59
- )
60
- );
61
- Template help_objects = Template.of("help_objects", StringMan.join(this.helpObjects, "\n"));
62
- Template footer = Template.of("footer", TranslatableCaption.of("help.help_footer").getComponent(player));
57
+ pageHeaderResolver
58
+ )))
59
+ .tag("help_objects", Tag.inserting(ComponentHelper.join(this.helpObjects, Component.text("\n"))))
60
+ .tag("footer", Tag.inserting(TranslatableCaption.of("help.help_footer").toComponent(player)))
61
+ .build();
63
62
  player.sendMessage(
64
63
  StaticCaption.of("<header>\n<page_header>\n<help_objects>\n<footer>"),
65
- header,
66
- page_header,
67
- help_objects,
68
- footer
64
+ contentResolver
69
65
  );
70
66
  }
71
67
  }
Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java CHANGED
@@ -35,7 +35,6 @@ import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
35
35
  import com.plotsquared.core.util.EventDispatcher;
36
36
  import com.plotsquared.core.util.PlayerManager;
37
37
  import net.kyori.adventure.text.Component;
38
- import net.kyori.adventure.text.minimessage.MiniMessage;
39
38
  import org.checkerframework.checker.nullness.qual.NonNull;
40
39
  import org.checkerframework.checker.nullness.qual.Nullable;
41
40
 
@@ -74,8 +73,7 @@ public final class PlaceholderRegistry {
74
73
  * @return a legacy-formatted string.
75
74
  */
76
75
  private static String legacyComponent(TranslatableCaption caption, LocaleHolder localeHolder) {
77
- Component component = MiniMessage.get().parse(caption.getComponent(localeHolder));
78
- return PlotSquared.platform().toLegacyPlatformString(component);
76
+ return PlotSquared.platform().toLegacyPlatformString(caption.toComponent(localeHolder).asComponent());
79
77
  }
80
78
 
81
79
  private void registerDefault() {
@@ -104,7 +102,7 @@ public final class PlaceholderRegistry {
104
102
  return plot.getAlias();
105
103
  });
106
104
  this.createPlaceholder("currentplot_owner", (player, plot) -> {
107
- if (plot.getFlag(ServerPlotFlag.class)){
105
+ if (plot.getFlag(ServerPlotFlag.class)) {
108
106
  return legacyComponent(TranslatableCaption.of("info.server"), player);
109
107
  }
110
108
  final UUID plotOwner = plot.getOwnerAbs();
@@ -302,17 +300,9 @@ public final class PlaceholderRegistry {
302
300
  /**
303
301
  * Event called when a new {@link Placeholder} has been added
304
302
  */
305
- public static class PlaceholderAddedEvent {
306
-
307
- private final Placeholder placeholder;
308
-
309
- public PlaceholderAddedEvent(Placeholder placeholder) {
310
- this.placeholder = placeholder;
311
- }
312
-
313
- public Placeholder getPlaceholder() {
314
- return this.placeholder;
315
- }
303
+ public record PlaceholderAddedEvent(
304
+ Placeholder placeholder
305
+ ) {
316
306
 
317
307
  }
318
308
 
Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java CHANGED
@@ -18,7 +18,6 @@
18
18
  */
19
19
  package com.plotsquared.core.util.task;
20
20
 
21
- import com.plotsquared.core.configuration.caption.Templates;
22
21
  import com.plotsquared.core.configuration.caption.TranslatableCaption;
23
22
  import com.plotsquared.core.events.PlotMergeEvent;
24
23
  import com.plotsquared.core.events.Result;
@@ -29,6 +28,9 @@ import com.plotsquared.core.player.PlotPlayer;
29
28
  import com.plotsquared.core.plot.Plot;
30
29
  import com.plotsquared.core.plot.PlotArea;
31
30
  import com.plotsquared.core.util.EventDispatcher;
31
+ import net.kyori.adventure.text.Component;
32
+ import net.kyori.adventure.text.minimessage.tag.Tag;
33
+ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
32
34
 
33
35
  import java.util.concurrent.Callable;
34
36
 
@@ -68,7 +70,7 @@ public final class AutoClaimFinishTask implements Callable<Boolean> {
68
70
  if (event.getEventResult() == Result.DENY) {
69
71
  player.sendMessage(
70
72
  TranslatableCaption.of("events.event_denied"),
71
- Templates.of("value", "Auto Merge")
73
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto Merge")))
72
74
  );
73
75
  } else {
74
76
  if (plot.getPlotModificationManager().autoMerge(event.getDir(), event.getMax(), player.getUUID(), player, true)) {
Core/src/main/java/com/plotsquared/core/uuid/CacheUUIDService.java CHANGED
@@ -67,8 +67,8 @@ public class CacheUUIDService implements UUIDService, Consumer<List<UUIDMapping>
67
67
  @Override
68
68
  public void accept(final @NonNull List<@NonNull UUIDMapping> uuidMappings) {
69
69
  for (final UUIDMapping mapping : uuidMappings) {
70
- this.uuidCache.put(mapping.getUuid(), mapping);
71
- this.usernameCache.put(mapping.getUsername(), mapping);
70
+ this.uuidCache.put(mapping.uuid(), mapping);
71
+ this.usernameCache.put(mapping.username(), mapping);
72
72
  }
73
73
  }
74
74
 
Core/src/main/java/com/plotsquared/core/uuid/UUIDMapping.java CHANGED
@@ -20,53 +20,14 @@ package com.plotsquared.core.uuid;
20
20
 
21
21
  import org.checkerframework.checker.nullness.qual.NonNull;
22
22
 
23
- import java.util.Objects;
24
23
  import java.util.UUID;
25
24
 
26
25
  /**
27
26
  * A pair consisting of a UUID and a username
28
27
  */
29
- public class UUIDMapping {
30
-
31
- private final UUID uuid;
32
- private final String username;
33
-
34
- public UUIDMapping(final @NonNull UUID uuid, final @NonNull String username) {
35
- this.uuid = uuid;
36
- this.username = username;
37
- }
38
-
39
- public @NonNull String getUsername() {
40
- return this.username;
41
- }
42
-
43
- public @NonNull UUID getUuid() {
44
- return this.uuid;
45
- }
46
-
47
- @Override
48
- public boolean equals(final Object o) {
49
- if (this == o) {
50
- return true;
51
- }
52
- if (o == null || getClass() != o.getClass()) {
53
- return false;
54
- }
55
- final UUIDMapping that = (UUIDMapping) o;
56
- return uuid.equals(that.uuid) && username.equals(that.username);
57
- }
58
-
59
- @Override
60
- public int hashCode() {
61
- return Objects.hash(uuid, username);
62
- }
63
-
64
- /**
65
- * @deprecated This method is not meant to be invoked or overridden, with no replacement.
66
- */
67
- @Deprecated(forRemoval = true, since = "6.6.0")
68
- protected boolean canEqual(final Object other) {
69
- return other instanceof UUIDMapping;
70
- }
28
+ public record UUIDMapping(
29
+ @NonNull UUID uuid,
30
+ @NonNull String username
31
+ ) {
71
32
 
72
33
  }
Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java CHANGED
@@ -41,13 +41,10 @@ import java.util.UUID;
41
41
  import java.util.concurrent.CompletableFuture;
42
42
  import java.util.concurrent.ExecutionException;
43
43
  import java.util.concurrent.Executor;
44
- import java.util.concurrent.Executors;
45
- import java.util.concurrent.ScheduledExecutorService;
46
44
  import java.util.concurrent.TimeUnit;
47
45
  import java.util.concurrent.TimeoutException;
48
46
  import java.util.function.BiConsumer;
49
47
  import java.util.function.Consumer;
50
- import java.util.function.Function;
51
48
 
52
49
  /**
53
50
  * An UUID pipeline is essentially an ordered list of
@@ -65,7 +62,6 @@ public class UUIDPipeline {
65
62
  private final Executor executor;
66
63
  private final List<UUIDService> serviceList;
67
64
  private final List<Consumer<List<UUIDMapping>>> consumerList;
68
- private final ScheduledExecutorService timeoutExecutor;
69
65
 
70
66
  /**
71
67
  * Construct a new UUID pipeline
@@ -77,7 +73,6 @@ public class UUIDPipeline {
77
73
  this.executor = executor;
78
74
  this.serviceList = Lists.newLinkedList();
79
75
  this.consumerList = Lists.newLinkedList();
80
- this.timeoutExecutor = Executors.newSingleThreadScheduledExecutor();
81
76
  }
82
77
 
83
78
  /**
@@ -162,7 +157,7 @@ public class UUIDPipeline {
162
157
  TimeUnit.MILLISECONDS
163
158
  );
164
159
  if (mappings.size() == 1) {
165
- return mappings.get(0).getUuid();
160
+ return mappings.get(0).uuid();
166
161
  }
167
162
  } catch (InterruptedException | ExecutionException e) {
168
163
  e.printStackTrace();
@@ -187,7 +182,7 @@ public class UUIDPipeline {
187
182
  try {
188
183
  final List<UUIDMapping> mappings = this.getNames(Collections.singletonList(uuid)).get(timeout, TimeUnit.MILLISECONDS);
189
184
  if (mappings.size() == 1) {
190
- return mappings.get(0).getUsername();
185
+ return mappings.get(0).username();
191
186
  }
192
187
  } catch (InterruptedException | ExecutionException e) {
193
188
  e.printStackTrace();
@@ -207,16 +202,14 @@ public class UUIDPipeline {
207
202
  * @param uuid UUID consumer
208
203
  */
209
204
  public void getSingle(final @NonNull String username, final @NonNull BiConsumer<@Nullable UUID, @Nullable Throwable> uuid) {
210
- this.getUUIDs(Collections.singletonList(username)).applyToEither(
211
- timeoutAfter(Settings.UUID.NON_BLOCKING_TIMEOUT),
212
- Function.identity()
213
- )
205
+ this.getUUIDs(Collections.singletonList(username))
206
+ .orTimeout(Settings.UUID.NON_BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS)
214
207
  .whenComplete((uuids, throwable) -> {
215
208
  if (throwable != null) {
216
209
  uuid.accept(null, throwable);
217
210
  } else {
218
211
  if (!uuids.isEmpty()) {
219
- uuid.accept(uuids.get(0).getUuid(), null);
212
+ uuid.accept(uuids.get(0).uuid(), null);
220
213
  } else {
221
214
  uuid.accept(null, null);
222
215
  }
@@ -231,16 +224,14 @@ public class UUIDPipeline {
231
224
  * @param username Username consumer
232
225
  */
233
226
  public void getSingle(final @NonNull UUID uuid, final @NonNull BiConsumer<@Nullable String, @Nullable Throwable> username) {
234
- this.getNames(Collections.singletonList(uuid)).applyToEither(
235
- timeoutAfter(Settings.UUID.NON_BLOCKING_TIMEOUT),
236
- Function.identity()
237
- )
227
+ this.getNames(Collections.singletonList(uuid))
228
+ .orTimeout(Settings.UUID.NON_BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS)
238
229
  .whenComplete((uuids, throwable) -> {
239
230
  if (throwable != null) {
240
231
  username.accept(null, throwable);
241
232
  } else {
242
233
  if (!uuids.isEmpty()) {
243
- username.accept(uuids.get(0).getUsername(), null);
234
+ username.accept(uuids.get(0).username(), null);
244
235
  } else {
245
236
  username.accept(null, null);
246
237
  }
@@ -262,7 +253,7 @@ public class UUIDPipeline {
262
253
  final @NonNull Collection<@NonNull UUID> requests,
263
254
  final long timeout
264
255
  ) {
265
- return this.getNames(requests).applyToEither(timeoutAfter(timeout), Function.identity());
256
+ return this.getNames(requests).orTimeout(timeout, TimeUnit.MILLISECONDS);
266
257
  }
267
258
 
268
259
  /**
@@ -279,13 +270,7 @@ public class UUIDPipeline {
279
270
  final @NonNull Collection<String> requests,
280
271
  final long timeout
281
272
  ) {
282
- return this.getUUIDs(requests).applyToEither(timeoutAfter(timeout), Function.identity());
283
- }
284
-
285
- private @NonNull CompletableFuture<@NonNull List<@NonNull UUIDMapping>> timeoutAfter(final long timeout) {
286
- final CompletableFuture<List<UUIDMapping>> result = new CompletableFuture<>();
287
- this.timeoutExecutor.schedule(() -> result.completeExceptionally(new TimeoutException()), timeout, TimeUnit.MILLISECONDS);
288
- return result;
273
+ return this.getUUIDs(requests).orTimeout(timeout, TimeUnit.MILLISECONDS);
289
274
  }
290
275
 
291
276
  /**
@@ -311,7 +296,7 @@ public class UUIDPipeline {
311
296
  if (service.canBeSynchronous()) {
312
297
  final List<UUIDMapping> completedRequests = service.getNames(remainingRequests);
313
298
  for (final UUIDMapping mapping : completedRequests) {
314
- remainingRequests.remove(mapping.getUuid());
299
+ remainingRequests.remove(mapping.uuid());
315
300
  }
316
301
  mappings.addAll(completedRequests);
317
302
  } else {
@@ -326,7 +311,7 @@ public class UUIDPipeline {
326
311
  for (final UUIDService service : serviceList) {
327
312
  final List<UUIDMapping> completedRequests = service.getNames(remainingRequests);
328
313
  for (final UUIDMapping mapping : completedRequests) {
329
- remainingRequests.remove(mapping.getUuid());
314
+ remainingRequests.remove(mapping.uuid());
330
315
  }
331
316
  mappings.addAll(completedRequests);
332
317
  if (remainingRequests.isEmpty()) {
@@ -345,7 +330,7 @@ public class UUIDPipeline {
345
330
  for (final UUID uuid : remainingRequests) {
346
331
  mappings.add(new UUIDMapping(
347
332
  uuid,
348
- MINI_MESSAGE.stripTokens(TranslatableCaption
333
+ MINI_MESSAGE.escapeTags(TranslatableCaption
349
334
  .of("info.unknown")
350
335
  .getComponent(ConsolePlayer.getConsole()))
351
336
  ));
@@ -380,7 +365,7 @@ public class UUIDPipeline {
380
365
  if (service.canBeSynchronous()) {
381
366
  final List<UUIDMapping> completedRequests = service.getUUIDs(remainingRequests);
382
367
  for (final UUIDMapping mapping : completedRequests) {
383
- remainingRequests.remove(mapping.getUsername());
368
+ remainingRequests.remove(mapping.username());
384
369
  }
385
370
  mappings.addAll(completedRequests);
386
371
  } else {
@@ -395,7 +380,7 @@ public class UUIDPipeline {
395
380
  for (final UUIDService service : serviceList) {
396
381
  final List<UUIDMapping> completedRequests = service.getUUIDs(remainingRequests);
397
382
  for (final UUIDMapping mapping : completedRequests) {
398
- remainingRequests.remove(mapping.getUsername());
383
+ remainingRequests.remove(mapping.username());
399
384
  }
400
385
  mappings.addAll(completedRequests);
401
386
  if (remainingRequests.isEmpty()) {
Core/src/main/resources/lang/messages_en.json CHANGED
@@ -21,8 +21,8 @@
21
21
  "web.generating_link": "<prefix><dark_aqua>Processing plot </dark_aqua><gold><plot></gold>",
22
22
  "web.plot_merged": "<prefix><red>This plot is merged and therefore cannot be downloaded</red>",
23
23
  "web.generating_link_failed": "<prefix><red>Failed to generate download link for plot <plot>!</red>",
24
- "web.generation_link_success": "<prefix><gold>Download: <gray><click:open_url:<download>><download></click></gray> \n Deletion: <gray><click:open_url:<delete>><delete></click></gray>\n<red>Attention: Opening the deletion link will delete the file immediately.</red></gold>",
25
- "web.generation_link_success_legacy_world": "<prefix><gold>Download: <gray><click:open_url:<url>><url></click></gray></gold>",
24
+ "web.generation_link_success": "<prefix><gold>Download: <gray><click:open_url:'<download>'><download></click></gray> \n Deletion: <gray><click:open_url:'<delete>'><delete></click></gray>\n<red>Attention: Opening the deletion link will delete the file immediately.</red></gold>",
25
+ "web.generation_link_success_legacy_world": "<prefix><gold>Download: <gray><click:open_url:'<url>'><url></click></gray></gold>",
26
26
  "web.save_failed": "<prefix><red>Failed to save.</red>",
27
27
  "web.load_null": "<prefix><gray>Please use </gray><dark_aqua><command> </dark_aqua><gray>to get a list of schematics.</gray>",
28
28
  "web.load_failed": "<prefix><red>Failed to load schematic.</red>",
@@ -59,7 +59,7 @@
59
59
  "worldedit.worldedit_bypass": "<prefix><gray><italic>To bypass your restrictions use </gray><dark_aqua><command></dark_aqua></italic>",
60
60
  "worldedit.worldedit_bypassed": "<prefix><gray>Currently bypassing WorldEdit restriction.</gray>",
61
61
  "gamemode.gamemode_was_bypassed": "<prefix><gold>You bypassed the gamemode (</gold><gray><gamemode></gray><gold>) <gold>set for </gold><gray><plot>.</gray>",
62
- "height.height_limit": "<prefix><gold>This plot area has building height limits: Min height: </gold><gray><minHeight></gray><gold>, Max height: </gold><gray><maxHeight></gray>",
62
+ "height.height_limit": "<prefix><gold>This plot area has building height limits: Min height: </gold><gray><minheight></gray><gold>, Max height: </gold><gray><maxheight></gray>",
63
63
  "notification.notify_enter": "<prefix><gray><player> entered your plot (</gray><gold><area>;<plot></gold><gray>).</gray>",
64
64
  "notification.notify_leave": "<prefix><gray><player> left your plot (</gray><gold><area>;<plot></gold><gray>).</gray>",
65
65
  "swap.swap_overlap": "<prefix><red>The proposed areas are not allowed to overlap.</red>",
@@ -281,7 +281,7 @@
281
281
  "debugexec.expiry_already_started": "<prefix><gold>Plot expiry task already started.</gold>",
282
282
  "debugexec.script_list_item": "<dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray><gold> <name></gold>",
283
283
  "debugexec.analyze_done": "<prefix><gold>Done. Use </gold><gray><command></gray><gold> for more information. ",
284
- "expiry.expired_options_clicky": "<gold><num> <are_or_is> expired: </gold><click:run_command:<list_cmd>><hover:show_text:\"<list_cmd>\"><gray><plot></gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:<cmd_del>><hover:show_text:\"<cmd_del>\"><gray>Delete this (<cmd_del>)</gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:<cmd_keep_1d>><hover:show_text:\"<cmd_keep_1d>\"><gray>Remind later (<cmd_keep_1d>)</gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:<cmd_keep>><hover:show_text:\"<cmd_keep>\"><gray>Keep this (<cmd_keep>)</gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:<cmd_no_show_expir>><hover:show_text:\"<cmd_no_show_expir>\"><gray>Don't show me this (<cmd_no_show_expir>)</gray></hover></click>",
284
+ "expiry.expired_options_clicky": "<gold><num> <are_or_is> expired: </gold><click:run_command:'<list_cmd>'><hover:show_text:'<list_cmd>'><gray><plot></gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:'<cmd_del>'><hover:show_text:'<cmd_del>'><gray>Delete this (<cmd_del>)</gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:'<cmd_keep_1d>'><hover:show_text:'<cmd_keep_1d>'><gray>Remind later (<cmd_keep_1d>)</gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:'<cmd_keep>'><hover:show_text:'<cmd_keep>'><gray>Keep this (<cmd_keep>)</gray></hover></click>\n<dark_gray> - </dark_gray><click:run_command:'<cmd_no_show_expir>'><hover:show_text:'<cmd_no_show_expir>'><gray>Don't show me this (<cmd_no_show_expir>)</gray></hover></click>",
285
285
  "debugimportworlds.single_plot_area": "<prefix><red>Must be a single plot area.</red>",
286
286
  "debugimportworlds.world_container": "<prefix><red>World container must be configured to be a separate directory to your base files.</red>",
287
287
  "debugroadregen.regen_done": "<prefix><gold>Regenerating plot south/east roads: </gold><gray><value></gray>\n<dark_gray> - </dark_gray><gold>Result: </gold><green>Success!</green>",
@@ -373,20 +373,20 @@
373
373
  "info.plot_no_description": "<gray>No description set.</gray>",
374
374
  "info.plot_caps_header": "<dark_gray><strikethrough>--------- <reset><gold>CAPS </gold><dark_gray><strikethrough>---------<reset>",
375
375
  "info.plot_caps_format": "<prefix><gray>- Cap Type: </gray><gold><cap> </gold><gray>| Status: </gray><gold><current></gold><gray>/</gray><gold><limit> </gold><gray>(</gray><gold><percentage>%</gold><gray>)</gray>",
376
- "info.plot_list_item": "<click:run_command:<command_tp>><hover:show_text:\"<command_tp>\"><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click><click:run_command:<command_info>> <hover:show_text:\"<hover_info>\"><gold> <plot></gold></hover></click><gray> - </gray><players>",
376
+ "info.plot_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click><click:run_command:'<command_info>'> <hover:show_text:'<hover_info>'><gold> <plot></gold></hover></click><gray> - </gray><players>",
377
377
  "info.plot_list_no_owner": "<dark_gray><plot></dark_gray>",
378
378
  "info.plot_list_owned_by": "<gold><plot></gold>",
379
379
  "info.plot_list_added_to": "<dark_aqua><plot></dark_aqua>",
380
380
  "info.plot_list_denied_on": "<gray><plot></gray>",
381
381
  "info.plot_list_default": "<gold><plot></gold>",
382
- "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:\"<dark_aqua>Online</dark_aqua>\"><gold><player></gold></hover>",
383
- "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:\"<dark_gray>Offline</dark_gray>\"><gold><player></gold></hover>",
384
- "info.plot_list_player_unknown": "<hover:show_text:\"<red>The owner of this plot is unknown</red>\"><white><info.unknown></white></hover>",
385
- "info.plot_list_player_server": "<hover:show_text:\"<red>The plot is owned by the server</red>\"><white><info.server></white></hover>",
386
- "info.plot_list_player_everyone": "<hover:show_text:\"<blue>The plot is owned by everyone</blue>\"><white><info.everyone></white></hover>",
382
+ "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_aqua>Online</dark_aqua>'><gold><player></gold></hover>",
383
+ "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_gray>Offline</dark_gray>'><gold><player></gold></hover>",
384
+ "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><info.unknown></white></hover>",
385
+ "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><info.server></white></hover>",
386
+ "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><info.everyone></white></hover>",
387
387
  "info.area_info_format": "<header>\n<reset><gold>Name: </gold><gray><name></gray>\n<gold>Type: </gold><gray><type></gray>\n<gold>Terrain: </gold><gray><terrain></gray>\n<gold>Usage: </gold><gray><usage>%</gray>\n<gold>Claimed: </gold><gray><claimed></gray>\n<gold>Clusters: </gold><gray><clusters></gray>\n<gold>Region: </gold><gray><region></gray>\n<gold>Generator: </gold><gray><generator></gray>\n<footer>",
388
388
  "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
389
- "info.area_list_item": "<click:run_command:<command_tp>><hover:show_text:\"<command_tp>\"><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:<command_info>><hover:show_text:\"<hover_info>\"><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
389
+ "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
390
390
  "working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
391
391
  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
392
392
  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
@@ -403,7 +403,7 @@
403
403
  "list.area_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> areas</gold>",
404
404
  "list.plot_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> plots</gold>",
405
405
  "list.plot_list_header": "<prefix><gold>List of <word> plots.</gold>",
406
- "list.page_turn": "<gold><click:run_command:<command1>>Back</gold><dark_gray> | </dark_gray><gold><click:run_command:<command2>>Next</click></gold><gray><clickable></gray>",
406
+ "list.page_turn": "<gold><click:run_command:'<command1>'>Back</gold><dark_gray> | </dark_gray><gold><click:run_command:'<command2>'>Next</click></gold><gray><clickable></gray>",
407
407
  "chat.plot_chat_spy_format": "<gray>[<gold>Plot Spy</gold>] [<gold><world>;<plot_id></gold>] <gold><sender></gold>: <gold><msg></gold></gray>",
408
408
  "chat.plot_chat_format": "<gray>[<gold>Plot Chat</gold>] [<gold><world>;<plot_id></gold>] <gold><sender></gold>: <gold><msg></gold></gray>",
409
409
  "chat.plot_chat_forced": "<prefix><gray>This world forces everyone to use plot chat.</gray>",
@@ -437,7 +437,7 @@
437
437
  "help.help_footer": "<dark_gray><strikethrough>---------<reset> <gold>PlotSquared Help </gold><dark_gray><strikethrough>---------<reset>",
438
438
  "help.help_info_item": "<gold><command> <gray><category> </gray><dark_gray>- </dark_gray><gray><category_desc></gray>",
439
439
  "help.help_item": "<gold><usage> <gray>[<gold><alias></gold>]</gray>\n <dark_gray>- </dark_gray><gray><desc></gray>\n",
440
- "help.help_display_all_commands": "<prefix><gray>Display all commands.</gray>",
440
+ "help.help_display_all_commands": "<gray>Display all commands.</gray>",
441
441
  "help.direction": "<prefix><gold>Current direction: </gold><gray><dir></gray>",
442
442
  "help.no_permission": "<prefix><red>You have no permission to access commands of that sub category, hence you cannot access the help page.</red>",
443
443
  "category.command_category_claiming": "<gray>Claiming</gray>",
@@ -510,11 +510,11 @@
510
510
  "flag.flag_info_header": "<dark_gray><strikethrough>---------<reset> <gold>PlotSquared Flags </gold><dark_gray><strikethrough>---------<reset>",
511
511
  "flag.flag_info_footer": "<dark_gray><strikethrough>---------<reset> <gold>PlotSquared Flags </gold><dark_gray><strikethrough>---------<reset>",
512
512
  "flag.flag_list_categories": "<gold><category>: </gold>",
513
- "flag.flag_list_flag": "<click:run_command:<command>><hover:show_text:\"<gray>Click to view information about the flag.</gray>\"><gray><flag></gray></hover></click><gray><suffix></gray>",
513
+ "flag.flag_list_flag": "<click:run_command:'<command>'><hover:show_text:'<gray>Click to view information about the flag.</gray>'><gray><flag></gray></hover></click><gray><suffix></gray>",
514
514
  "flag.flag_info_name": "<gray>Name: <gold><flag></gold></gray>",
515
515
  "flag.flag_info_category": "<gray>Category: </gray><gold><value></gold>",
516
516
  "flag.flag_info_description": "<gray>Description: </gray>",
517
- "flag.flag_info_example": "<gray>Example: <click:suggest_command:<command> <flag> <value>><gold><command> <flag> <value></click></gold></gray>",
517
+ "flag.flag_info_example": "<gray>Example: <click:run_command:'<command> <flag> <value>'><gold><command> <flag> <value></gold></click></gray>",
518
518
  "flag.flag_info_default_value": "<gray>Default Value: <value></gray>",
519
519
  "flags.flag_category_string": "<gray>String Flags</gray>",
520
520
  "flags.flag_category_integers": "<gray>Integer Flags</gray>",
Core/src/test/java/com/plotsquared/core/plot/FlagTest.java CHANGED
@@ -128,4 +128,5 @@ public class FlagTest {
128
128
  ((TranslatableCaption) exception.getErrorMessage()).getKey()
129
129
  );
130
130
  }
131
+
131
132
  }
Core/src/test/java/com/plotsquared/core/plot/PlotRangeIteratorTest.java CHANGED
@@ -107,4 +107,5 @@ public class PlotRangeIteratorTest {
107
107
  Assertions.assertFalse(range.hasNext());
108
108
  Assertions.assertThrows(NoSuchElementException.class, range::next);
109
109
  }
110
+
110
111
  }
Core/src/test/java/com/plotsquared/core/synchronization/LockRepositoryTest.java CHANGED
@@ -51,4 +51,5 @@ class LockRepositoryTest {
51
51
  }));
52
52
  Assertions.assertFalse(lock.isLocked());
53
53
  }
54
+
54
55
  }
Core/src/test/java/com/plotsquared/core/util/StringManTest.java CHANGED
@@ -33,8 +33,10 @@ public class StringManTest {
33
33
  new Message("title \"sub title\"", List.of("title", "sub title")),
34
34
  new Message("\"a title\" subtitle", List.of("a title", "subtitle")),
35
35
  new Message("\"title\" \"subtitle\"", List.of("title", "subtitle")),
36
- new Message("\"How <bold>bold</bold> of you\" \"to assume I like <rainbow>rainbows</rainbow>\"",
37
- List.of("How <bold>bold</bold> of you", "to assume I like <rainbow>rainbows</rainbow>"))
36
+ new Message(
37
+ "\"How <bold>bold</bold> of you\" \"to assume I like <rainbow>rainbows</rainbow>\"",
38
+ List.of("How <bold>bold</bold> of you", "to assume I like <rainbow>rainbows</rainbow>")
39
+ )
38
40
  );
39
41
 
40
42
  for (Message message : messages) {
@@ -53,4 +55,5 @@ public class StringManTest {
53
55
  private record Message(String input, List<String> expected) {
54
56
 
55
57
  }
58
+
56
59
  }
README.md CHANGED
@@ -4,14 +4,14 @@
4
4
 
5
5
  ---
6
6
 
7
- PlotSquared is a land and world management plugin for Minecraft.
8
- It includes several highly configurable world generators.
7
+ PlotSquared is a land and world management plugin for Minecraft.
8
+ It includes several highly configurable world generators.
9
9
  You can create plots of land in existing worlds using plot clusters, or you can have a full world of plots.
10
10
 
11
11
  For the end user, PlotSquared is packed with a tonne of cool features.
12
- It allows you to merge plots, and build together with your friends.
12
+ It allows you to merge plots, and build together with your friends.
13
13
  You can also change a lot of plot specific settings in the form of
14
- flags. Such as: weather, time, game modes, pvp status.
14
+ flags. Such as: weather, time, game modes, pvp status.
15
15
 
16
16
  Whilst we provide a whole load of unique features, the biggest focus
17
17
  is to provide a lag-free and smooth experience.
@@ -33,11 +33,13 @@ is to provide a lag-free and smooth experience.
33
33
  * [Contributing](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md)
34
34
 
35
35
  ### Developer Resources
36
+
36
37
  * [API Documentation](https://intellectualsites.github.io/plotsquared-documentation/api/api-documentation)
37
38
  * [Event API](https://intellectualsites.github.io/plotsquared-documentation/api/event-api)
38
39
  * [Flag API](https://intellectualsites.github.io/plotsquared-documentation/api/flag-api)
39
40
 
40
41
  # Official Addons
42
+
41
43
  * [Plot2Dynmap](http://www.spigotmc.org/resources/plot2dynmap.1292/)
42
44
  * [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/)
43
45
  * [PlotHider](https://www.spigotmc.org/resources/plot-hider.20701/)
@@ -46,10 +48,14 @@ is to provide a lag-free and smooth experience.
46
48
 
47
49
  Want to add new features to PlotSquared or fix bugs yourself? You can get the game running, with PlotSquared, from the code here:
48
50
 
49
- For additional information about compiling PlotSquared, see [CONTRIBUTING.md](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md)
51
+ For additional information about compiling PlotSquared,
52
+ see [CONTRIBUTING.md](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md)
50
53
 
51
54
  ### Submitting Your Changes
52
- PlotSquared is open source (specifically licensed under GPL v3), so note that your contributions will also be open source. The best way to submit a change is to create a fork on GitHub, put your changes there, and then create a "pull request" on our PlotSquared repository.
55
+
56
+ PlotSquared is open source (specifically licensed under GPL v3), so note that your contributions will also be open source. The
57
+ best way to submit a change is to create a fork on GitHub, put your changes there, and then create a "pull request" on our
58
+ PlotSquared repository.
53
59
 
54
60
  <a href="https://yourkit.com/">
55
61
  <img src="https://www.yourkit.com/images/yklogo.png">
@@ -57,4 +63,6 @@ PlotSquared is open source (specifically licensed under GPL v3), so note that yo
57
63
 
58
64
  Thank you to YourKit for supporting our product by providing us with their innovative and intelligent tools
59
65
  for monitoring and profiling Java and .NET applications.
60
- YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/), and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
66
+ YourKit is the creator
67
+ of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),
68
+ and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
build.gradle.kts CHANGED
@@ -1,6 +1,7 @@
1
+ import com.diffplug.gradle.spotless.SpotlessPlugin
1
2
  import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
2
3
  import java.net.URI
3
- import com.diffplug.gradle.spotless.SpotlessPlugin
4
+ import xyz.jpenilla.runpaper.task.RunServer
4
5
 
5
6
  plugins {
6
7
  java
@@ -15,10 +16,12 @@ plugins {
15
16
 
16
17
  eclipse
17
18
  idea
19
+
20
+ id("xyz.jpenilla.run-paper") version "2.1.0"
18
21
  }
19
22
 
20
- group = "com.plotsquared"
21
- version = "6.11.1"
23
+ group = "com.intellectualsites.plotsquared"
24
+ version = "7.0.0-SNAPSHOT"
22
25
 
23
26
  if (!File("$rootDir/.git").exists()) {
24
27
  logger.lifecycle("""
@@ -74,12 +77,12 @@ subprojects {
74
77
  }
75
78
 
76
79
  dependencies {
77
- implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.24"))
80
+ implementation(platform("com.intellectualsites.bom:bom-newest:1.29"))
78
81
  }
79
82
 
80
83
  dependencies {
81
84
  // Tests
82
- testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
85
+ testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
83
86
  }
84
87
 
85
88
  plugins.withId("java") {
@@ -207,7 +210,7 @@ subprojects {
207
210
  }
208
211
 
209
212
  nexusPublishing {
210
- repositories {
213
+ this.repositories {
211
214
  sonatype {
212
215
  nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
213
216
  snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
@@ -218,3 +221,17 @@ nexusPublishing {
218
221
  tasks.getByName<Jar>("jar") {
219
222
  enabled = false
220
223
  }
224
+
225
+ val supportedVersions = listOf("1.16.5", "1.17", "1.17.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20")
226
+ tasks {
227
+ supportedVersions.forEach {
228
+ register<RunServer>("runServer-$it") {
229
+ minecraftVersion(it)
230
+ pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
231
+ .toTypedArray())
232
+ jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
233
+ group = "run paper"
234
+ runDirectory.set(file("run-$it"))
235
+ }
236
+ }
237
+ }
gradle/libs.versions.toml CHANGED
@@ -1,28 +1,27 @@
1
1
  [versions]
2
2
  # Platform expectations
3
- guice = "5.1.0"
3
+ guice = "7.0.0"
4
4
  spotbugs = "4.7.3"
5
5
 
6
6
  # Plugins
7
- worldedit = "7.2.13"
8
- placeholderapi = "2.11.2"
7
+ worldedit = "7.2.14"
8
+ placeholderapi = "2.11.3"
9
9
  luckperms = "5.4"
10
- essentialsx = "2.19.7"
10
+ essentialsx = "2.20.0"
11
11
  mvdwapi = "3.1.1"
12
12
 
13
13
  # Third party
14
14
  prtree = "2.0.1"
15
15
  aopalliance = "1.0"
16
- cloud-services = "1.8.2"
16
+ cloud-services = "1.8.3"
17
17
  arkitektonika = "2.1.2"
18
- squirrelid = "0.3.1"
19
- http4j = "1.3"
18
+ squirrelid = "0.3.2"
20
19
 
21
20
  # Gradle plugins
22
- shadow = "7.1.2"
21
+ shadow = "8.1.1"
23
22
  grgit = "4.1.1"
24
- spotless = "6.16.0"
25
- nexus = "1.2.0"
23
+ spotless = "6.19.0"
24
+ nexus = "1.3.0"
26
25
 
27
26
  [libraries]
28
27
  # Platform expectations
@@ -44,7 +43,6 @@ cloudServices = { group = "cloud.commandframework", name = "cloud-services", ver
44
43
  mvdwapi = { group = "com.intellectualsites.mvdwplaceholderapi", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" }
45
44
  squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" }
46
45
  arkitektonika = { group = "com.intellectualsites.arkitektonika", name = "Arkitektonika-Client", version.ref = "arkitektonika" }
47
- http4j = { group = "com.intellectualsites.http", name = "HTTP4J", version.ref = "http4j" }
48
46
 
49
47
  [plugins]
50
48
  shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
gradle/wrapper/gradle-wrapper.jar CHANGED
Binary file
gradle/wrapper/gradle-wrapper.properties CHANGED
@@ -1,6 +1,6 @@
1
1
  distributionBase=GRADLE_USER_HOME
2
2
  distributionPath=wrapper/dists
3
- distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
3
+ distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
4
4
  networkTimeout=10000
5
5
  zipStoreBase=GRADLE_USER_HOME
6
6
  zipStorePath=wrapper/dists
gradlew CHANGED
@@ -85,9 +85,6 @@ done
85
85
  APP_BASE_NAME=${0##*/}
86
86
  APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87
87
 
88
- # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89
- DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90
-
91
88
  # Use the maximum available, or set MAX_FD != -1 to use that value.
92
89
  MAX_FD=maximum
93
90
 
@@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144
141
  case $MAX_FD in #(
145
142
  max*)
146
143
  # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147
- # shellcheck disable=SC3045
144
+ # shellcheck disable=SC3045
148
145
  MAX_FD=$( ulimit -H -n ) ||
149
146
  warn "Could not query maximum file descriptor limit"
150
147
  esac
@@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
152
149
  '' | soft) :;; #(
153
150
  *)
154
151
  # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155
- # shellcheck disable=SC3045
152
+ # shellcheck disable=SC3045
156
153
  ulimit -n "$MAX_FD" ||
157
154
  warn "Could not set maximum file descriptor limit to $MAX_FD"
158
155
  esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
197
194
  done
198
195
  fi
199
196
 
197
+
198
+ # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199
+ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200
+
200
201
  # Collect all arguments for the java command;
201
202
  # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202
203
  # shell script including quotes and variable substitutions, so put them in
javadocfooter.html CHANGED
@@ -1,4 +1,4 @@
1
1
  Javadocs generated for
2
- <a rel="noopener nofollow noreferrer" href="https://github.com/IntellectualSites/PlotSquared/" target="_blank"> PlotSquared</a> |
3
- <a rel="noopener nofollow noreferrer" href="https://intellectualsites.github.io/plotsquared-documentation/"> Documentation </a> |
4
- Visit us on our <a rel="noopener nofollow noreferrer" href="https://discord.gg/intellectualsites"> Discord server</a> :)
2
+ <a href="https://github.com/IntellectualSites/PlotSquared/" rel="noopener nofollow noreferrer" target="_blank"> PlotSquared</a> |
3
+ <a href="https://intellectualsites.github.io/plotsquared-documentation/" rel="noopener nofollow noreferrer"> Documentation </a> |
4
+ Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)
renovate.json CHANGED
@@ -4,7 +4,9 @@
4
4
  "config:base",
5
5
  ":semanticCommitsDisabled"
6
6
  ],
7
- "labels": ["dependencies"],
7
+ "labels": [
8
+ "dependencies"
9
+ ],
8
10
  "rebaseWhen": "conflicted",
9
- "schedule": ["on the first day of the week"]
11
+ "schedule": ["on the first day of the month"]
10
12
  }
settings.gradle.kts CHANGED
@@ -2,7 +2,7 @@ rootProject.name = "PlotSquared"
2
2
 
3
3
  include("Core", "Bukkit")
4
4
 
5
- project(":Core").name = "PlotSquared-Core"
6
- project(":Bukkit").name = "PlotSquared-Bukkit"
5
+ project(":Core").name = "plotsquared-core"
6
+ project(":Bukkit").name = "plotsquared-bukkit"
7
7
 
8
8
  enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")